Bump mypy to 1.5

python · hauntsaninja · Aug 16, 2023 · Aug 11, 2023 · Aug 11, 2023 · Aug 11, 2023
commit 82c04080c9b8da43180de2d22c04ff7cfafbaa59
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
@@ -36,28 +36,18 @@ jobs:
       matrix:
         # tkinter doesn't import on macOS-12
         os: ["ubuntu-latest", "windows-latest", "macos-11"]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
 
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
-        if: ${{ matrix.os != 'macos-11' || matrix.python-version != '3.7' }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip
           cache-dependency-path: requirements-tests.txt
           allow-prereleases: true
-        # Handle the py37 run on macos differently,
-        # to workaround https://github.com/actions/setup-python/issues/682
-      - name: Setup Python 3.7.16 on macos
-        if: ${{ matrix.os == 'macos-11' && matrix.python-version == '3.7' }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.7.16"
-          cache: pip
-          cache-dependency-path: requirements-tests.txt
       - name: Install dependencies
         run: pip install -r requirements-tests.txt
       - name: Run stubtest

diff --git a/.github/workflows/stubtest_stdlib.yml b/.github/workflows/stubtest_stdlib.yml
@@ -32,28 +32,18 @@ jobs:
       matrix:
         # tkinter doesn't import on macOS 12
         os: ["ubuntu-latest", "windows-latest", "macos-11"]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
 
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
-        if: ${{ matrix.os != 'macos-11' || matrix.python-version != '3.7' }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
          
8000
 cache: pip
           cache-dependency-path: requirements-tests.txt
           allow-prereleases: true
-        # Handle the py37 run on macos differently,
-        # to workaround https://github.com/actions/setup-python/issues/682
-      - name: Setup Python 3.7.16 on macos
-        if: ${{ matrix.os == 'macos-11' && matrix.python-version == '3.7' }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.7.16"
-          cache: pip
-          cache-dependency-path: requirements-tests.txt
       - name: Install dependencies
         run: pip install -r requirements-tests.txt
       - name: Run stubtest

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -85,7 +85,7 @@ jobs:
     strategy:
       matrix:
         platform: ["linux", "win32", "darwin"]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
       fail-fast: false
     steps:
       - uses: actions/checkout@v3

diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -7,7 +7,7 @@ flake8-bugbear==23.7.10; python_version >= "3.8"  # must match .pre-commit-confi
 flake8-noqa==1.3.2; python_version >= "3.8"       # must match .pre-commit-config.yaml
 flake8-pyi==23.6.0; python_version >= "3.8"       # must match .pre-commit-config.yaml
 isort==5.12.0; python_version >= "3.8"            # must match .pre-commit-config.yaml
-mypy==1.4.1
+mypy==1.5
 pre-commit-hooks==4.4.0                           # must match .pre-commit-config.yaml
 pytype==2023.7.21; platform_system != "Windows" and python_version >= "3.8" and python_version < "3.11"
 ruff==0.0.280                                     # must match .pre-commit-config.yaml

diff --git a/tests/mypy_test.py b/tests/mypy_test.py
@@ -47,7 +47,7 @@
     print_error("Cannot import mypy. Did you install it?")
     sys.exit(1)
 
-SUPPORTED_VERSIONS = ["3.12", "3.11", "3.10", "3.9", "3.8", "3.7"]
+SUPPORTED_VERSIONS = ["3.12", "3.11", "3.10", "3.9", "3.8"]
 SUPPORTED_PLATFORMS = ("linux", "win32", "darwin")
 DIRECTORIES_TO_TEST = [Path("stdlib"), Path("stubs")]
 
@@ -86,21 +86,6 @@ def remove_dev_suffix(version: str) -> str:
 parser = argparse.ArgumentParser(
     description="Typecheck typeshed's stubs with mypy. Patterns are unanchored regexps on the full path."
 )
-if sys.version_info < (3, 8):
-
-    class ExtendAction(argparse.Action):
-        def __call__(
-            self,
-            parser: argparse.ArgumentParser,
-            namespace: argparse.Namespace,
-            values: Sequence[str],
-            option_string: object = None,
-        ) -> None:
-            items = getattr(namespace, self.dest) or []
-            items.extend(values)
-            setattr(namespace, self.dest, items)
-
-    parser.register("action", "extend", ExtendAction)
 parser.add_argument(
     "filter",
     type=valid_path,

diff --git a/tests/stubtest_allowlists/darwin-py37.txt b/tests/stubtest_allowlists/darwin-py37.txt
diff --git a/tests/stubtest_allowlists/linux-py37.txt b/tests/stubtest_allowlists/linux-py37.txt
diff --git a/tests/stubtest_allowlists/py37.txt b/tests/stubtest_allowlists/py37.txt
diff --git a/tests/stubtest_allowlists/win32-py37.txt b/tests/stubtest_allowlists/win32-py37.txt
diff --git a/tests/utils.py b/tests/utils.py
@@ -23,7 +23,7 @@ def colored(text: str, color: str | None = None, **kwargs: Any) -> str:  # type:
 
 
 # A backport of functools.cache for Python <3.9
-# This module is imported by mypy_test.py, which needs to run on 3.7 in CI
+# This module is imported by mypy_test.py, which needs to run on 3.8 in CI
 cache = lru_cache(None)