feat: drop support for Python 3.8

finswimmer · finswimmer · commit ca34402e7dab · 2024-10-12T16:50:31.000+02:00
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -8,10 +8,6 @@ tests_task:
 
   env:
     matrix:
-      - PYTHON: python3.8
-        PYTHON_VERSION: 3.8
-        PYTHON_PACKAGE: python38
-        SQLITE_PACKAGE: py38-sqlite3
       - PYTHON: python3.9
         PYTHON_VERSION: 3.9
         PYTHON_PACKAGE: python39
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -124,7 +124,6 @@ jobs:
           - name: macOS aarch64
             image: macos-14
         python-version:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,7 +29,7 @@ Changelog = "https://python-poetry.org/history/"
 
 # Requirements
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9"
 
 poetry-core = { git = "https://github.com/python-poetry/poetry-core.git", branch = "main" }
 build = "^1.2.1"
@@ -104,7 +104,7 @@ extend-exclude = [
 ]
 fix = true
 line-length = 88
-target-version = "py38"
+target-version = "py39"
 
 [tool.ruff.lint]
 extend-select = [
diff --git a/src/poetry/console/commands/env/remove.py b/src/poetry/console/commands/env/remove.py
@@ -7,7 +7,6 @@
 from cleo.helpers import option
 
 from poetry.console.commands.command import Command
-from poetry.utils._compat import is_relative_to
 
 
 if TYPE_CHECKING:
@@ -55,8 +54,8 @@ def handle(self) -> int:
             self.line(f"Deleted virtualenv: <comment>{venv.path}</comment>")
         if remove_all_envs or is_in_project:
             for venv in manager.list():
-                if not is_in_project or is_relative_to(
-                    venv.path, self.poetry.pyproject_path.parent
+                if not is_in_project or venv.path.is_relative_to(
+                    self.poetry.pyproject_path.parent
                 ):
                     manager.remove_venv(venv.path)
                     self.line(f"Deleted virtualenv: <comment>{venv.path}</comment>")
diff --git a/src/poetry/console/commands/init.py b/src/poetry/console/commands/init.py
@@ -1,12 +1,11 @@
 from __future__ import annotations
 
+from collections.abc import Mapping
 from contextlib import suppress
 from pathlib import Path
 from typing import TYPE_CHECKING
 from typing import Any
 from typing import ClassVar
-from typing import Dict
-from typing import Mapping
 from typing import Union
 
 from cleo.helpers import option
@@ -27,7 +26,7 @@
 
     from poetry.repositories import RepositoryPool
 
-Requirements = Dict[str, Union[str, Mapping[str, Any]]]
+Requirements = dict[str, Union[str, Mapping[str, Any]]]
 
 
 class InitCommand(Command):
diff --git a/src/poetry/inspection/info.py b/src/poetry/inspection/info.py
@@ -9,8 +9,6 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import Mapping
-from typing import Sequence
 
 import pkginfo
 
@@ -31,6 +29,8 @@
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
+    from collections.abc import Mapping
+    from collections.abc import Sequence
 
     from packaging.metadata import RawMetadata
     from packaging.utils import NormalizedName
@@ -523,7 +523,7 @@ def from_path(cls, path: Path) -> PackageInfo:
             return cls.from_sdist(path=path)
 
 
-@functools.lru_cache(maxsize=None)
+@functools.cache
 def get_pep517_metadata(path: Path) -> PackageInfo:
     """
     Helper method to use PEP-517 library to build and read package metadata.
diff --git a/src/poetry/mixology/version_solver.py b/src/poetry/mixology/version_solver.py
@@ -6,7 +6,6 @@
 
 from typing import TYPE_CHECKING
 from typing import Optional
-from typing import Tuple
 
 from poetry.core.packages.dependency import Dependency
 
@@ -32,7 +31,7 @@
 _conflict = object()
 
 
-DependencyCacheKey = Tuple[
+DependencyCacheKey = tuple[
     str, Optional[str], Optional[str], Optional[str], Optional[str]
 ]
 
diff --git a/src/poetry/packages/direct_origin.py b/src/poetry/packages/direct_origin.py
@@ -22,7 +22,7 @@
     from poetry.utils.cache import ArtifactCache
 
 
-@functools.lru_cache(maxsize=None)
+@functools.cache
 def _get_package_from_git(
     url: str,
     branch: str | None = None,
diff --git a/src/poetry/packages/package_collection.py b/src/poetry/packages/package_collection.py
@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING
-from typing import List
 
 from poetry.packages.dependency_package import DependencyPackage
 
@@ -13,7 +12,7 @@
     from poetry.core.packages.package import Package
 
 
-class PackageCollection(List[DependencyPackage]):
+class PackageCollection(list[DependencyPackage]):
     def __init__(
         self,
         dependency: Dependency,
diff --git a/src/poetry/plugins/plugin_manager.py b/src/poetry/plugins/plugin_manager.py
@@ -9,7 +9,6 @@
 from functools import cached_property
 from pathlib import Path
 from typing import TYPE_CHECKING
-from typing import Sequence
 
 import tomlkit
 
@@ -30,6 +29,7 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
     from typing import Any
 
     from cleo.io.io import IO
diff --git a/src/poetry/puzzle/solver.py b/src/poetry/puzzle/solver.py
@@ -5,8 +5,6 @@
 from collections import defaultdict
 from contextlib import contextmanager
 from typing import TYPE_CHECKING
-from typing import FrozenSet
-from typing import Tuple
 
 from poetry.mixology import resolve_version
 from poetry.mixology.failure import SolveFailureError
@@ -195,7 +193,7 @@ def _solve(self) -> tuple[list[Package], list[int]]:
         return final_packages, depths
 
 
-DFSNodeID = Tuple[str, FrozenSet[str], bool]
+DFSNodeID = tuple[str, frozenset[str], bool]
 
 
 class DFSNode:
diff --git a/src/poetry/repositories/http_repository.py b/src/poetry/repositories/http_repository.py
@@ -8,7 +8,6 @@
 from pathlib import Path
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import Iterator
 
 import requests
 import requests.adapters
@@ -36,6 +35,8 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator
+
     from packaging.utils import NormalizedName
     from poetry.core.packages.utils.link import Link
 
diff --git a/src/poetry/repositories/link_sources/base.py b/src/poetry/repositories/link_sources/base.py
@@ -6,8 +6,6 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 from typing import ClassVar
-from typing import DefaultDict
-from typing import List
 
 from poetry.core.constraints.version import Version
 from poetry.core.packages.package import Package
@@ -18,12 +16,13 @@
 
 
 if TYPE_CHECKING:
+    from collections import defaultdict
     from collections.abc import Iterator
 
     from packaging.utils import NormalizedName
     from poetry.core.packages.utils.link import Link
 
-    LinkCache = DefaultDict[NormalizedName, DefaultDict[Version, List[Link]]]
+    LinkCache = defaultdict[NormalizedName, defaultdict[Version, list[Link]]]
 
 
 logger = logging.getLogger(__name__)
diff --git a/src/poetry/utils/_compat.py b/src/poetry/utils/_compat.py
@@ -4,11 +4,6 @@
 import sys
 
 from contextlib import suppress
-from typing import TYPE_CHECKING
-
-
-if TYPE_CHECKING:
-    from pathlib import Path
 
 
 if sys.version_info < (3, 11):
@@ -60,28 +55,11 @@ def getencoding() -> str:
         return locale.getencoding()
 
 
-def is_relative_to(this: Path, other: Path) -> bool:
-    """
-    Return whether `this` path is relative to the `other` path. This is compatibility wrapper around
-    `PurePath.is_relative_to()` method. This method was introduced only in Python 3.9.
-
-    See: https://docs.python.org/3/library/pathlib.html#pathlib.PurePath.is_relative_to
-    """
-    if sys.version_info < (3, 9):
-        with suppress(ValueError):
-            this.relative_to(other)
-            return True
-        return False
-
-    return this.is_relative_to(other)
-
-
 __all__ = [
     "WINDOWS",
     "decode",
     "encode",
     "getencoding",
-    "is_relative_to",
     "metadata",
     "tomllib",
 ]
diff --git a/src/poetry/utils/dependency_specification.py b/src/poetry/utils/dependency_specification.py
@@ -7,8 +7,6 @@
 
 from pathlib import Path
 from typing import TYPE_CHECKING
-from typing import Dict
-from typing import List
 from typing import TypeVar
 from typing import Union
 from typing import cast
@@ -26,7 +24,7 @@
     from poetry.utils.env import Env
 
 
-DependencySpec = Dict[str, Union[str, bool, Dict[str, Union[str, bool]], List[str]]]
+DependencySpec = dict[str, Union[str, bool, dict[str, Union[str, bool]], list[str]]]
 BaseSpec = TypeVar("BaseSpec", DependencySpec, InlineTable)
 
 GIT_URL_SCHEMES = {"git+http", "git+https", "git+ssh"}
diff --git a/src/poetry/utils/env/base_env.py b/src/poetry/utils/env/base_env.py
@@ -23,15 +23,13 @@
 
 
 if TYPE_CHECKING:
-    from typing import Tuple
-
     from packaging.tags import Tag
     from poetry.core.version.markers import BaseMarker
     from virtualenv.seed.wheels.util import Wheel
 
     from poetry.utils.env.generic_env import GenericEnv
 
-    PythonVersion = Tuple[int, int, int, str, int]
+    PythonVersion = tuple[int, int, int, str, int]
 
 
 class Env(ABC):
diff --git a/src/poetry/utils/isolated_build.py b/src/poetry/utils/isolated_build.py
@@ -6,8 +6,6 @@
 from contextlib import redirect_stdout
 from io import StringIO
 from typing import TYPE_CHECKING
-from typing import Collection
-from typing import Iterator
 
 from build.env import IsolatedEnv as BaseIsolatedEnv
 
@@ -17,6 +15,8 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Collection
+    from collections.abc import Iterator
     from pathlib import Path
 
     from build import DistributionType
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -7,10 +7,10 @@
 import shutil
 import sys
 
+from collections.abc import Iterator
 from pathlib import Path
 from typing import TYPE_CHECKING
 from typing import Any
-from typing import Iterator
 
 import httpretty
 import keyring
diff --git a/tests/console/commands/test_check.py b/tests/console/commands/test_check.py
@@ -10,7 +10,7 @@
 
 
 if TYPE_CHECKING:
-    from typing import Iterator
+    from collections.abc import Iterator
 
     from cleo.testers.command_tester import CommandTester
     from pytest_mock import MockerFixture
diff --git a/tests/helpers.py b/tests/helpers.py
@@ -24,8 +24,8 @@
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
+    from collections.abc import Mapping
     from typing import Any
-    from typing import Mapping
 
     import httpretty
 
diff --git a/tests/inspection/test_info.py b/tests/inspection/test_info.py
@@ -4,7 +4,6 @@
 
 from subprocess import CalledProcessError
 from typing import TYPE_CHECKING
-from typing import Iterator
 from zipfile import ZipFile
 
 import pytest
@@ -20,6 +19,7 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator
     from pathlib import Path
 
     from packaging.metadata import RawMetadata
diff --git a/tests/integration/test_utils_vcs_git.py b/tests/integration/test_utils_vcs_git.py
@@ -7,7 +7,6 @@
 from hashlib import sha1
 from pathlib import Path
 from typing import TYPE_CHECKING
-from typing import Iterator
 from typing import TypedDict
 from urllib.parse import urlparse
 from urllib.parse import urlunparse
@@ -27,6 +26,8 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator
+
     from dulwich.client import FetchPackResult
     from dulwich.client import GitClient
     from pytest import TempPathFactory
diff --git a/tests/masonry/builders/test_editable_builder.py b/tests/masonry/builders/test_editable_builder.py
@@ -7,7 +7,6 @@
 
 from pathlib import Path
 from typing import TYPE_CHECKING
-from typing import Iterator
 
 import pytest
 
@@ -29,6 +28,8 @@
 
 
 if TYPE_CHECKING:
+    from collections.abc import Iterator
+
     from pytest_mock import MockerFixture
 
     from poetry.poetry import Poetry
diff --git a/tests/packages/test_locker.py b/tests/packages/test_locker.py
diff --git a/tests/repositories/fixtures/pypi.org/generate.py b/tests/repositories/fixtures/pypi.org/generate.py
diff --git a/tests/repositories/fixtures/python_hosted.py b/tests/repositories/fixtures/python_hosted.py
diff --git a/tests/repositories/test_installed_repository.py b/tests/repositories/test_installed_repository.py
diff --git a/tests/types.py b/tests/types.py
diff --git a/tests/utils/env/test_env.py b/tests/utils/env/test_env.py
