Update mypy version (onnx#968)

aipul · May 17, 2018 · 94ca052 · 94ca052
1 parent ba86ec2
commit 94ca052
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/docs/Operators.md b/docs/Operators.md
@@ -1465,7 +1465,7 @@ test_cases = {
            [[5, 6], [7, 8]]),
     '3d': ([[[1, 2], [3, 4]], [[5, 6], [7, 8]]],
            [[[9, 10], [11, 12]], [[13, 14], [15, 16]]])
-}
+}  # type: Dict[Text, Sequence[Any]]
 
 for test_case, values_ in test_cases.items():
     values = [np.asarray(v, dtype=np.float32) for v in values_]

diff --git a/onnx/__init__.py b/onnx/__init__.py
@@ -77,7 +77,7 @@ def _deserialize(s, proto):  # type: (bytes, _Proto) -> _Proto
         raise ValueError('No ParseFromString method is detected. '
                          '\ntype is {}'.format(type(proto)))
 
-    decoded = proto.ParseFromString(s)  # type: ignore
+    decoded = cast(Optional[int], proto.ParseFromString(s))
     if decoded is not None and decoded != len(s):
         raise google.protobuf.message.DecodeError(
             "Protobuf decoding consumed too few bytes: {} out of {}".format(

diff --git a/onnx/backend/test/case/node/concat.py b/onnx/backend/test/case/node/concat.py
@@ -8,6 +8,7 @@
 import onnx
 from ..base import Base
 from . import expect
+from typing import Dict, Sequence, Text, Any
 
 
 class Concat(Base):
@@ -21,7 +22,7 @@ def export():  # type: () -> None
                    [[5, 6], [7, 8]]),
             '3d': ([[[1, 2], [3, 4]], [[5, 6], [7, 8]]],
                    [[[9, 10], [11, 12]], [[13, 14], [15, 16]]])
-        }
+        }  # type: Dict[Text, Sequence[Any]]
 
         for test_case, values_ in test_cases.items():
             values = [np.asarray(v, dtype=np.float32) for v in values_]

diff --git a/onnx/backend/test/runner/__init__.py b/onnx/backend/test/runner/__init__.py
@@ -127,7 +127,7 @@ def test_suite(self):  # type: () -> unittest.TestSuite
         '''
         suite = unittest.TestSuite()
         for case in sorted(self.test_cases.values()):
-            suite.addTests(unittest.defaultTestLoader.loadTestsFromTestCase(case))  # type: ignore
+            suite.addTests(unittest.defaultTestLoader.loadTestsFromTestCase(case))
         return suite
 
     # For backward compatibility (we used to expose `.tests`)

diff --git a/setup.py b/setup.py
@@ -285,7 +285,7 @@ def build_extensions(self):
 
 if sys.version_info[0] == 3:
     # Mypy doesn't work with Python 2
-    extras_require['mypy'] = ['mypy==0.570']
+    extras_require['mypy'] = ['mypy==0.600']
 
 ################################################################################
 # Final