Merge pull request #11 from common-workflow-language/fix-future-req

Fix install_requires spec for 'futures' module.

Author: tetron

setup.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import os
+import sys
 
 import setuptools.command.egg_info as egg_info_cmd
 from setuptools import setup, find_packages
@@ -14,6 +15,15 @@
 except ImportError:
     tagger = egg_info_cmd.egg_info
 
+install_requires=[
+    'schema-salad >= 1.14',
+    'typing >= 3.5.2',
+    'junit-xml >= 1.7'
+]
+
+if sys.version_info.major == 2:
+    install_requires.append('futures >= 3.0.5')
+
 setup(name='cwltest',
       version='1.0',
       description='Common workflow language testing framework',
@@ -24,16 +34,7 @@
       download_url="https://github.com/common-workflow-language/cwltest",
       license='Apache 2.0',
       packages=["cwltest"],
-      install_requires=[
-          'schema-salad >= 1.14',
-          'typing >= 3.5.2',
-          'junit-xml >= 1.7'
-      ],
-      extras_require={
-          ':python_version == "2.7"': [
-              'futures >= 3.0.5',
-          ],
-      },
+      install_requires=install_requires,
       tests_require=[],
       entry_points={
           'console_scripts': [ "cwltest=cwltest:main" ]

tox.ini

@@ -14,8 +14,8 @@ deps = -rrequirements.txt
 commands = make mypy
 whitelist_externals = make
 deps =
-  mypy-lang>=0.4
-  typed-ast
+  mypy>=0.471
+  typed-ast==0.6.3
   -rrequirements.txt
 
 [testenv:py35-lint]

typeshed/2.7/__builtin__.pyi

@@ -556,7 +556,10 @@ class dict(MutableMapping[_KT, _VT], Generic[_KT, _VT]):
     @overload
     def fromkeys(seq: Sequence[_T], value: _S) -> Dict[_T, _S]: ...
     def __len__(self) -> int: ...
+    @overload
     def __getitem__(self, k: _KT) -> _VT: ...
+    @overload
+    def __getitem__(self, k: unicode) -> _VT: ...
     def __setitem__(self, k: _KT, v: _VT) -> None: ...
     def __delitem__(self, v: _KT) -> None: ...
     def __contains__(self, o: object) -> bool: ...