Remove 3.6 support

Signed-off-by: Bernát Gábor <[email protected]>

Author: gaborbernat

.github/workflows/check.yml

@@ -28,8 +28,7 @@ jobs:
           - 3.9
           - 3.8
           - 3.7
-          - 3.6
-          - pypy3
+          - pypy-3.7-v7.3.5
     steps:
       - name: Setup python for tox
         uses: actions/setup-python@v2
@@ -47,7 +46,7 @@ jobs:
           import subprocess; import json; import os
           major, minor, impl = json.loads(subprocess.check_output(["python", "-c", "import json; import sys; import platform; print(json.dumps([sys.version_info[0], sys.version_info[1], platform.python_implementation()]));"], universal_newlines=True))
           with open(os.environ["GITHUB_ENV"], "a") as file_handler:
-                file_handler.write("TOXENV=" + (f'py{major}{minor}' if impl == "CPython" else f'pypy{major}') + "\n")
+                file_handler.write("TOXENV=" + (f'py{major}{minor}' if impl == "CPython" else f'pypy{major}{minor}') + "\n")
         shell: python
       - name: Setup test suite
         run: tox -vv --notest

.pre-commit-config.yaml

@@ -15,6 +15,7 @@ repos:
     rev: v2.29.0
     hooks:
       - id: pyupgrade
+        args: ["--py37-plus"]
   - repo: https://github.com/PyCQA/isort
     rev: 5.9.3
     hooks:

setup.cfg

@@ -98,7 +98,7 @@ testpaths = tests
 junit_family = xunit2
 
 [mypy]
-python_version = 3.6
+python_version = 3.7
 disallow_any_generics = True
 disallow_subclassing_any = True
 disallow_untyped_calls = True

src/devpi_process/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import random
 import socket
 import string
@@ -8,13 +10,13 @@
 from subprocess import PIPE, Popen, check_call
 from threading import Thread
 from types import TracebackType
-from typing import IO, Dict, Iterator, List, Optional, Sequence, Type, cast
+from typing import IO, Iterator, Sequence, cast
 
 from .version import __version__
 
 
 class Index:
-    def __init__(self, base_url: str, name: str, user: str, client_cmd_base: List[str]) -> None:
+    def __init__(self, base_url: str, name: str, user: str, client_cmd_base: list[str]) -> None:
         self._client_cmd_base = client_cmd_base
         self._server_url = base_url
         self.name = name
@@ -36,7 +38,7 @@ def __repr__(self) -> str:
 
 
 class IndexServer:
-    def __init__(self, path: Path, with_root_pypi: bool = False, start_args: Optional[Sequence[str]] = None) -> None:
+    def __init__(self, path: Path, with_root_pypi: bool = False, start_args: Sequence[str] | None = None) -> None:
         self.path = path
         self._with_root_pypi = with_root_pypi
         self._start_args: Sequence[str] = [] if start_args is None else start_args
@@ -57,16 +59,16 @@ def _exe(name: str) -> str:
 
         self._server_dir = self.path / "server"
         self._client_dir = self.path / "client"
-        self._indexes: Dict[str, Index] = {}
-        self._process: Optional["Popen[str]"] = None
+        self._indexes: dict[str, Index] = {}
+        self._process: Popen[str] | None = None
         self._has_use = False
-        self._stdout_drain: Optional[Thread] = None
+        self._stdout_drain: Thread | None = None
 
     @property
     def user(self) -> str:
         return "root"
 
-    def __enter__(self) -> "IndexServer":
+    def __enter__(self) -> IndexServer:
         self._create_and_start_server()
         self._setup_client()
         return self
@@ -124,9 +126,9 @@ def create_index(self, name: str, *args: str) -> Index:
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BaseException]],  # noqa: U100
-        exc_val: Optional[BaseException],  # noqa: U100
-        exc_tb: Optional[TracebackType],  # noqa: U100
+        exc_type: type[BaseException] | None,  # noqa: U100
+        exc_val: BaseException | None,  # noqa: U100
+        exc_tb: TracebackType | None,  # noqa: U100
     ) -> None:
         if self._process is not None:  # pragma: no cover # defend against devpi startup fail
             self._process.terminate()

src/pytest_devpi/version.py

@@ -1,3 +1,4 @@
 """ Version information """
+from __future__ import annotations
 
 __version__ = "0.1.dev1+gc78a9e3.d20210617"

tests/demo_pkg_inline/build.py

@@ -1,9 +1,10 @@
+from __future__ import annotations
+
 import os
 import sys
 import tarfile
 from io import BytesIO
 from textwrap import dedent
-from typing import List, Optional
 from zipfile import ZipFile
 
 name = "demo_pkg_inline"
@@ -55,7 +56,7 @@
 
 def build_wheel(
     wheel_directory: str,
-    metadata_directory: Optional[str] = None,  # noqa: U100
+    metadata_directory: str | None = None,  # noqa: U100
     config_settings: None = None,  # noqa: U100
 ) -> str:
     base_name = f"{name}-{version}-py{sys.version_info[0]}-none-any.whl"
@@ -68,7 +69,7 @@ def build_wheel(
 
 def get_requires_for_build_wheel(
     config_settings: None = None,  # noqa: U100
-) -> List[str]:
+) -> list[str]:
     return []  # pragma: no cover # only executed in non-host pythons
 
 
@@ -92,5 +93,5 @@ def build_sdist(
 
 def get_requires_for_build_sdist(
     config_settings: None = None,  # noqa: U100
-) -> List[str]:
+) -> list[str]:
     return []  # pragma: no cover # only executed in non-host pythons

tests/test_devpi_process.py

@@ -1,6 +1,7 @@
+from __future__ import annotations
+
 from importlib.util import module_from_spec, spec_from_file_location
 from pathlib import Path
-from typing import Tuple
 
 import pytest
 from _pytest.tmpdir import TempPathFactory
@@ -16,7 +17,7 @@ def test_version() -> None:
 
 
 @pytest.fixture(scope="session")
-def demo_artifacts(tmp_path_factory: TempPathFactory) -> Tuple[Path, Path]:
+def demo_artifacts(tmp_path_factory: TempPathFactory) -> tuple[Path, Path]:
     spec = spec_from_file_location("demo_pkg_inline.build", str(Path(__file__).parent / "demo_pkg_inline" / "build.py"))
     assert spec is not None
     build = module_from_spec(spec)
@@ -29,7 +30,7 @@ def demo_artifacts(tmp_path_factory: TempPathFactory) -> Tuple[Path, Path]:
     return wheel, sdist
 
 
-def test_create_server(tmp_path: Path, demo_artifacts: Tuple[Path, Path]) -> None:
+def test_create_server(tmp_path: Path, demo_artifacts: tuple[Path, Path]) -> None:
     with IndexServer(tmp_path) as server:
         assert repr(server)
         state = get(server.url).json()["result"]["root"]

tox.ini

@@ -5,8 +5,7 @@ envlist =
     py39
     py38
     py37
-    py36
-    pypy3
+    pypy37
     type
     pkg_desc
 isolated_build = true