WIP

pyproject.toml

@@ -42,7 +42,7 @@ importlib-metadata = { version = ">=4.4", python = "<3.10" }
 installer = "^0.7.0"
 keyring = "^24.3.1"
 # packaging uses calver, so version is unclamped
-packaging = ">=23.1"
+packaging = ">=24.0"
 pexpect = "^4.7.0"
 pkginfo = "^1.10"
 platformdirs = ">=3.0.0,<5"

src/poetry/utils/env/base_env.py

@@ -7,6 +7,7 @@
 import sys
 import sysconfig
 
+from functools import cached_property
 from pathlib import Path
 from subprocess import CalledProcessError
 from typing import TYPE_CHECKING
@@ -20,12 +21,16 @@
 
 
 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]
+
 
 class Env:
     """
@@ -52,7 +57,6 @@ def __init__(self, path: Path, base: Path | None = None) -> None:
 
         self._base = base or path
 
-        self._marker_env: dict[str, Any] | None = None
         self._site_packages: SitePackages | None = None
         self._paths: dict[str, str] | None = None
         self._supported_tags: list[Tag] | None = None
@@ -71,8 +75,8 @@ def base(self) -> Path:
         return self._base
 
     @property
-    def version_info(self) -> tuple[int, int, int, str, int]:
-        version_info: tuple[int, int, int, str, int] = self.marker_env["version_info"]
+    def version_info(self) -> PythonVersion:
+        version_info: PythonVersion = self.marker_env["version_info"]
         return version_info
 
     @property
@@ -87,12 +91,9 @@ def python(self) -> Path:
         """
         return Path(self._bin(self._executable))
 
-    @property
+    @cached_property
     def marker_env(self) -> dict[str, Any]:
-        if self._marker_env is None:
-            self._marker_env = self.get_marker_env()
-
-        return self._marker_env
+        return self.get_marker_env()
 
     @property
     def parent_env(self) -> GenericEnv:

src/poetry/utils/env/script_strings.py

@@ -107,7 +107,7 @@ def _version_nodot(version):
 else:
     print(sys.prefix)
 """
-
+# TODO
 GET_PYTHON_VERSION = """\
 import sys
 
@@ -117,6 +117,7 @@ def _version_nodot(version):
 GET_PYTHON_VERSION_ONELINER = (
     "import sys; print('.'.join([str(s) for s in sys.version_info[:3]]))"
 )
+
 GET_ENV_PATH_ONELINER = "import sys; print(sys.prefix)"
 
 GET_SYS_PATH = """\

src/poetry/utils/env/virtual_env.py

@@ -12,20 +12,19 @@
 from typing import TYPE_CHECKING
 from typing import Any
 
-from packaging.tags import Tag
-
 from poetry.utils.env.base_env import Env
 from poetry.utils.env.script_strings import GET_BASE_PREFIX
 from poetry.utils.env.script_strings import GET_ENVIRONMENT_INFO
 from poetry.utils.env.script_strings import GET_PATHS
 from poetry.utils.env.script_strings import GET_SYS_PATH
-from poetry.utils.env.script_strings import GET_SYS_TAGS
 from poetry.utils.env.system_env import SystemEnv
 
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
 
+    from packaging.tags import Tag
+
 
 class VirtualEnv(Env):
     """
@@ -50,9 +49,28 @@ def sys_path(self) -> list[str]:
         return paths
 
     def get_supported_tags(self) -> list[Tag]:
-        output = self.run_python_script(GET_SYS_TAGS)
+        # output = self.run_python_script(GET_SYS_TAGS)
+        #
+        # return [Tag(*t) for t in json.loads(output)]
+        from packaging.tags import compatible_tags
+        from packaging.tags import cpython_tags
+        from packaging.tags import generic_tags
+
+        python = self.version_info[:3]
+        interpreter_name = self.marker_env["interpreter_name"]
+        interpreter_version = self.marker_env["interpreter_version"]
+
+        if interpreter_name == "pp":
+            interpreter = "pp3"
+        elif interpreter_name == "cp":
+            interpreter = f"{interpreter_name}{interpreter_version}"
+        else:
+            interpreter = None
 
-        return [Tag(*t) for t in json.loads(output)]
+        return [
+            *(cpython_tags(python) if interpreter_name == "cp" else generic_tags()),
+            *compatible_tags(python, interpreter=interpreter),
+        ]
 
     def get_marker_env(self) -> dict[str, Any]:
         output = self.run_python_script(GET_ENVIRONMENT_INFO)

tests/utils/env/test_env.py

@@ -99,7 +99,17 @@ def test_env_get_supported_tags_matches_inside_virtualenv(
 
     import packaging.tags
 
-    assert venv.get_supported_tags() == list(packaging.tags.sys_tags())
+    vn = set(venv.get_supported_tags())
+    pack = set(packaging.tags.sys_tags())
+
+    vn_s = list(f"{tag!s}" for tag in vn)
+    pack_s = list(f"{tag!s}" for tag in pack)
+
+    # (Path("~/code/poetry").expanduser() / "venv_tags.txt").write_text(vn_s, encoding="utf-8")
+    # (Path("~/code/poetry").expanduser() / "packaging_tags.txt").write_text(pack_s, encoding="utf-8")
+
+    assert len(vn) == len(pack)
+    assert sorted(vn_s) == sorted(pack_s)
 
 
 @pytest.mark.skipif(os.name == "nt", reason="Symlinks are not support for Windows")