Fix pkgresources import iso6

changelogs/unreleased/fix-pkgresources-import.yml

@@ -0,0 +1,7 @@
+description: Fixed dropped import from pkg_resources
+change-type: patch
+sections:
+  bugfix: "Addressed breaking change in setuptools (core Python library)"
+  upgrade-note: "If you had previously constrained `setuptools<71` in your project's `requirements.txt`, you may now drop the constraint"
+destination-branches:
+  - iso6

src/inmanta/env.py

@@ -48,17 +48,9 @@
 from inmanta.server.bootloader import InmantaBootloader
 from inmanta.stable_api import stable_api
 from inmanta.util import strtobool
+from packaging.requirements import InvalidRequirement
 from packaging import version
 
-try:
-    from typing import TYPE_CHECKING
-except ImportError:
-    TYPE_CHECKING = False
-
-if TYPE_CHECKING:
-    from packaging.requirements import InvalidRequirement
-else:
-    from pkg_resources.extern.packaging.requirements import InvalidRequirement
 
 LOGGER = logging.getLogger(__name__)
 LOGGER_PIP = logging.getLogger("inmanta.pip")  # Use this logger to log pip commands or data related to pip commands.
@@ -930,6 +922,8 @@ def is_owned_by(self, owners: abc.Set[str]) -> bool:
         installed_constraints: abc.Set[OwnedRequirement] = frozenset(
             OwnedRequirement(requirement, dist_info.key)
             for dist_info in pkg_resources.working_set
+            # pypa/setuptools#4482. May be removed when we migrate away from pkg_resources
+            if not dist_info.location.endswith("setuptools/_vendor")
             for requirement in dist_info.requires()
         )
         inmanta_constraints: abc.Set[OwnedRequirement] = frozenset(
@@ -1025,6 +1019,8 @@ def check_legacy(cls, in_scope: Pattern[str], constraints: Optional[list[Require
             requirement
             for dist_info in working_set
             if in_scope.fullmatch(dist_info.key)
+            # pypa/setuptools#4482. May be removed when we migrate away from pkg_resources
+            if not dist_info.location.endswith("setuptools/_vendor")
             for requirement in dist_info.requires()
         )
 

src/inmanta/moduletool.py

@@ -36,7 +36,7 @@
 from configparser import ConfigParser
 from functools import total_ordering
 from re import Pattern
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional
 
 import click
 import more_itertools
@@ -74,12 +74,9 @@
     gitprovider,
 )
 from inmanta.stable_api import stable_api
+from packaging.requirements import InvalidRequirement
 from packaging.version import Version
 
-if TYPE_CHECKING:
-    from packaging.requirements import InvalidRequirement
-else:
-    from pkg_resources.extern.packaging.requirements import InvalidRequirement
 
 LOGGER = logging.getLogger(__name__)