Issue/drop pkg resources - first part

docs/conf.py

@@ -12,7 +12,7 @@
 # serve to show the default.
 import importlib.metadata
 import shutil
-import sys, os, pkg_resources, datetime
+import sys, os, datetime
 from importlib.metadata import PackageNotFoundError
 from sphinx.errors import ConfigError
 

src/inmanta/agent/executor.py

@@ -34,14 +34,12 @@
 from dataclasses import dataclass
 from typing import Any, Dict, Optional, Sequence
 
-import pkg_resources
-
 import inmanta.types
 import inmanta.util
 from inmanta import const
 from inmanta.agent import config as cfg
 from inmanta.data.model import PipConfig, ResourceIdStr, ResourceType, ResourceVersionIdStr
-from inmanta.env import PythonEnvironment
+from inmanta.env import PythonEnvironment, SafeRequirement
 from inmanta.loader import ModuleSource
 from inmanta.resources import Id
 from inmanta.types import JsonType
@@ -310,7 +308,7 @@ def create_and_install_environment(self, blueprint: EnvBlueprint) -> None:
         self.init_env()
         if len(req):  # install_for_config expects at least 1 requirement or a path to install
             self.install_for_config(
-                requirements=list(pkg_resources.parse_requirements(req)),
+                requirements=[SafeRequirement(requirement_string=e) for e in req],
                 config=blueprint.pip_config,
             )
 

src/inmanta/agent/in_process_executor.py

@@ -23,8 +23,6 @@
 from concurrent.futures.thread import ThreadPoolExecutor
 from typing import Any, Optional
 
-import pkg_resources
-
 import inmanta.agent.cache
 import inmanta.protocol
 import inmanta.util
@@ -35,6 +33,7 @@
 from inmanta.agent.handler import HandlerAPI, SkipResource
 from inmanta.const import ParameterSource
 from inmanta.data.model import AttributeStateChange, ResourceIdStr, ResourceVersionIdStr
+from inmanta.env import SafeRequirement
 from inmanta.loader import CodeLoader
 from inmanta.resources import Id, Resource
 from inmanta.types import Apireturn
@@ -572,7 +571,7 @@ async def _install(self, blueprint: executor.ExecutorBlueprint) -> None:
             await loop.run_in_executor(
                 self.process.thread_pool,
                 self._env.install_for_config,
-                list(pkg_resources.parse_requirements(blueprint.requirements)),
+                [SafeRequirement(requirement_string=e) for e in blueprint.requirements],
                 blueprint.pip_config,
             )
             await loop.run_in_executor(self.process.thread_pool, self._loader.deploy_version, blueprint.sources)

src/inmanta/file_parser.py

@@ -18,8 +18,7 @@
 
 import os
 
-from pkg_resources import Requirement
-
+from inmanta.env import SafeRequirement
 from ruamel.yaml import YAML
 from ruamel.yaml.comments import CommentedMap
 
@@ -56,11 +55,11 @@ class RequirementsTxtParser:
     """
 
     @classmethod
-    def parse(cls, filename: str) -> list[Requirement]:
+    def parse(cls, filename: str) -> list[SafeRequirement]:
         """
-        Get all the requirements in `filename` as a list of `Requirement` instances.
+        Get all the requirements in `filename` as a list of `SafeRequirement` instances.
         """
-        return [Requirement.parse(r) for r in cls.parse_requirements_as_strs(filename)]
+        return [SafeRequirement(requirement_string=r) for r in cls.parse_requirements_as_strs(filename)]
 
     @classmethod
     def parse_requirements_as_strs(cls, filename: str) -> list[str]:
@@ -86,21 +85,22 @@ def get_content_with_dep_removed(cls, filename: str, remove_dep_on_pkg: str) ->
         if not os.path.exists(filename):
             raise Exception(f"File {filename} doesn't exist")
 
+        removed_dependency = SafeRequirement(requirement_string=remove_dep_on_pkg)
         result = ""
         line_continuation_buffer = ""
         with open(filename, encoding="utf-8") as fd:
             for line in fd.readlines():
                 if line_continuation_buffer:
                     line_continuation_buffer += line
                     if not line.endswith("\\"):
-                        if Requirement.parse(line_continuation_buffer).key != remove_dep_on_pkg:
+                        if SafeRequirement(requirement_string=line_continuation_buffer).name != removed_dependency.name:
                             result += line_continuation_buffer
                         line_continuation_buffer = ""
                 elif not line.strip() or line.strip().startswith("#"):
                     result += line
                 elif line.endswith("\\"):
                     line_continuation_buffer = line
-                elif Requirement.parse(line).key != remove_dep_on_pkg.lower():
+                elif SafeRequirement(requirement_string=line).name != removed_dependency.name:
                     result += line
                 else:
                     # Dependency matches `remove_dep_on_pkg` => Remove line from result

src/inmanta/main.py

@@ -26,9 +26,9 @@
 from typing import Any, Callable, Optional, Union, cast
 
 import click
+import importlib_metadata
 import texttable
 from click_plugins import with_plugins
-from pkg_resources import iter_entry_points
 
 from inmanta import protocol
 from inmanta.config import Config, cmdline_rest_transport
@@ -182,7 +182,7 @@ def get_table(header: list[str], rows: list[list[str]], data_type: Optional[list
     return table.draw()
 
 
-@with_plugins(iter_entry_points("inmanta.cli_plugins"))
+@with_plugins(importlib_metadata.entry_points(group="inmanta.cli_plugins"))
 @click.group(help="Base command")
 @click.option("--host", help="The server hostname to connect to")
 @click.option("--port", help="The server port to connect to")