Merge 6d8da69 into 8f339c4

rcli/autodetect.py

@@ -70,9 +70,9 @@ def egg_info_writer(cmd, basename, filename):
     config = dict(parser.items('rcli'))
     for k, v in six.iteritems(config):
         if v.lower() in ('y', 'yes', 'true'):
-            config[k] = True
+            config[k] = True  # type: ignore
         elif v.lower() in ('n', 'no', 'false'):
-            config[k] = False
+            config[k] = False  # type: ignore
         else:
             try:
                 config[k] = json.loads(v)

rcli/config.py

@@ -21,7 +21,7 @@
 import types
 import typing
 
-from typingplus.types import Singleton
+from typet import Singleton
 import pkg_resources
 import setuptools  # noqa: F401 pylint: disable=unused-import
 import six
@@ -104,6 +104,7 @@ def distribution(self):
         """The distribution containing the currently active entry point."""
         if self.entry_point:
             return self.entry_point.dist
+        return None
 
     def __getattr__(self, attr):
         # type: (str) -> typing.Any

rcli/dispatcher.py

@@ -11,7 +11,8 @@
 import logging
 import sys
 import types  # noqa: F401 pylint: disable=unused-import
-import typing  # noqa: F401 pylint: disable=unused-import
+
+import typingplus as typing  # noqa: F401 pylint: disable=unused-import
 
 from docopt import docopt
 import colorama
@@ -26,6 +27,7 @@
 )
 from .config import settings
 
+typing.upgrade_typing()
 
 _LOGGER = logging.getLogger(__name__)
 

rcli/display.py

@@ -106,7 +106,7 @@ def print_status(msg, color):
             raise e.exc  # pylint: disable=raising-bad-type
     except (KeyboardInterrupt, EOFError):
         raise
-    except:
+    except Exception:
         print_status('FAILED', Fore.RED)
         raise
     else:

setup.cfg

@@ -30,6 +30,6 @@ warn_no_return = False
 ignore_errors = True
 
 [pylint]
-disable = ungrouped-imports,no-name-in-module,too-few-public-methods,invalid-sequence-index,bad-continuation,import-error,invalid-name,no-member,locally-disabled,locally-enabled,redefined-outer-name,redefined-variable-type
+disable = ungrouped-imports,no-name-in-module,too-few-public-methods,invalid-sequence-index,bad-continuation,import-error,invalid-name,no-member,locally-disabled,locally-enabled,redefined-outer-name,redefined-variable-type,stop-iteration-return
 reports = no
 known-standard-library = typing

setup.py

@@ -14,12 +14,14 @@
 if os.path.isdir('rcli.egg-info'):
     try:
         shutil.rmtree('rcli.egg-info')
-    except:  # pylint: disable=bare-except
+    except IOError:
         pass
 
 with open('README.rst') as readme_fp:
     readme = readme_fp.read()
 
+common_requires = ['docopt >= 0.6.2, < 1',
+                   'six >= 1.10.0']
 setup(
     name='rcli',
     use_scm_version=True,
@@ -32,22 +34,17 @@
     license='MIT',
     packages=find_packages(exclude=['tests', 'docs']),
     install_requires=[
-        'typingplus >= 1.0.2, < 2',
+        'typet >= 0.3.4, < 4',
         'backports.shutil_get_terminal_size',
         'colorama >= 0.3.6, < 1',
-        'tqdm >= 4.9.0, < 5',
-        'docopt >= 0.6.2, < 1',
-        'six >= 1.10.0'
-    ],
+        'tqdm >= 4.9.0, < 5'
+    ] + common_requires,
     setup_requires=[
-        'six >= 1.10.0',
         'packaging',
         'appdirs',
         'pytest-runner',
-        'setuptools_scm',
-        'typingplus >= 1.0.2, < 2',
-        'docopt >= 0.6.2, < 1'
-    ],
+        'setuptools_scm'
+    ] + common_requires,
     tests_require=[
         'pytest >= 3.0'
     ],

tests/test_annotations.py

@@ -72,6 +72,7 @@ def test_py2_annotations(create_project, run):
     """Test type hinting with Python 2 annotations."""
     with create_project('''
         def types(str1, num):
+            # type: (str, int) -> None
             """usage: say types <str1> <num>"""
             print(type(str1))
             print(type(num))