Update mypy (and other linters) (#91)

Author: elprans

.github/workflows/tests.yml

@@ -52,7 +52,8 @@ jobs:
     - name: Test
       if: steps.release.outputs.version == 0
       run: |
-        pip install --verbose -e .[test]
+        python -m pip install -U pip setuptools
+        python -m pip install --verbose -e .[test]
         flake8 immutables/ tests/
         mypy immutables/
         python -m pytest -v

pyproject.toml

@@ -9,6 +9,7 @@ testpaths = "tests"
 filterwarnings = "default"
 
 [tool.mypy]
+files = "immutables"
 incremental = true
 strict = true
 

setup.py

@@ -8,9 +8,9 @@
     # pycodestyle is a dependency of flake8, but it must be frozen because
     # their combination breaks too often
     # (example breakage: https://gitlab.com/pycqa/flake8/issues/427)
-    'flake8~=3.8.4',
-    'pycodestyle~=2.6.0',
-    'mypy==0.942',
+    'flake8~=5.0.4',
+    'pycodestyle~=2.9.1',
+    'mypy==0.971',
     'pytest~=6.2.4',
 ]
 

tests/test-data/check-immu.test

@@ -70,4 +70,4 @@ def mutate() -> None:
         mm.set('3', '4')
         m2 = mm.finish()
 
-    reveal_type(m2)  # N: Revealed type is "immutables._map.Map[builtins.str*, builtins.str*]"
+    reveal_type(m2)  # N: Revealed type is "immutables._map.Map[builtins.str, builtins.str]"

tests/test_mypy.py

@@ -1,4 +1,5 @@
 import os
+import sys
 
 try:
     import mypy.test.testcmdline
@@ -20,7 +21,19 @@ def renormalize_error_messages(messages):
 
     this_file_dir = os.path.dirname(os.path.realpath(__file__))
     test_data_prefix = os.path.join(this_file_dir, 'test-data')
+    parent_dir = os.path.dirname(this_file_dir)
+
+    mypy_path = os.environ.get("MYPYPATH")
+    if mypy_path:
+        mypy_path = parent_dir + os.pathsep + mypy_path
+    else:
+        mypy_path = parent_dir
 
     class ImmuMypyTest(mypy.test.testcmdline.PythonCmdlineSuite):
         data_prefix = test_data_prefix
         files = ['check-immu.test']
+
+        def run_case(self, testcase):
+            if sys.version_info >= (3, 7):
+                os.environ["MYPYPATH"] = mypy_path
+            super().run_case(testcase)

tests/test_none_keys.py

@@ -6,16 +6,16 @@
 
 
 none_hash = map_hash(None)
-assert(none_hash != 1)
-assert(none_hash.bit_length() <= 32)
+assert none_hash != 1
+assert none_hash.bit_length() <= 32
 
 none_hash_u = ctypes.c_size_t(none_hash).value
 not_collision = 0xffffffff & (~none_hash_u)
 
 mask = 0x7ffffffff
 none_collisions = [none_hash_u & (mask >> shift)
                    for shift in reversed(range(0, 32, 5))]
-assert(len(none_collisions) == 7)
+assert len(none_collisions) == 7
 none_collisions = [
     ctypes.c_ssize_t(h | (not_collision & (mask << shift))).value
     for shift, h in zip(range(5, 37, 5), none_collisions)