Issue/drop pkg resources - first part

.github/dependabot.yml

@@ -31,9 +31,6 @@ updates:
     # Allow both direct and indirect updates for all packages
     - dependency-type: "all"
   ignore:
-    # #6668
-    - dependency-name: "setuptools"
-      update-types: ["version-update:semver-major"]
     - dependency-name: "pytest-inmanta-extensions"
       versions: [">=0.0.1"]
     - dependency-name: "pydantic"

setup.py

@@ -29,7 +29,7 @@
     "pynacl~=1.5",
     "python-dateutil~=2.0",
     "pyyaml~=6.0",
-    "setuptools<71",
+    "setuptools",
     "texttable~=1.0",
     "tornado~=6.0",
     # lower bound because of ilevkivskyi/typing_inspect#100

src/inmanta/module.py

@@ -104,13 +104,11 @@ def __init__(self, requirement: inmanta.util.CanonicalRequirement) -> None:
                 f"InmantaModuleRequirement instances work with inmanta module names, not python package names. "
                 f"Problematic case: {str(requirement)}"
             )
-        self._requirement: inmanta.util.CanonicalRequirement = requirement
+        self._requirement = inmanta.util.parse_requirement(str(requirement))
 
     @property
     def project_name(self) -> str:
-        # Requirement converts all "_" to "-". Inmanta modules use "_"
         warnings.warn(InmantaWarning("The `project_name` property has been deprecated in favor of `name`"))
-
         return self.name
 
     @property
@@ -121,7 +119,7 @@ def name(self) -> str:
     def key(self) -> str:
         # Requirement converts all "_" to "-". Inmanta modules use "_"
         warnings.warn(InmantaWarning("The `key` property has been deprecated in favor of `name`"))
-        return self._requirement.name.replace("-", "_")
+        return self.name
 
     @property
     def specifier(self) -> SpecifierSet:

tests/moduletool/conftest.py

@@ -204,17 +204,17 @@ def modules_repo(git_modules_dir) -> str:
     E-> H
     D-> F,G
     """
-    make_module_simple_deps(reporoot, "A", ["B", "C", "D"], project=True)
-    make_module_simple_deps(reporoot, "B")
-    c = make_module_simple_deps(reporoot, "C", ["E", "F", "E::a"], version="3.0")
-    add_file(c, "model/a.cf", "import modI", "add mod C::a", "3.2")
-    make_module_simple_deps(reporoot, "D", ["F", "G"])
-    e = make_module_simple_deps(reporoot, "E", ["H"], version="3.0")
-    add_file(e, "model/a.cf", "import modJ", "add mod E::a", "3.2")
-    make_module_simple_deps(reporoot, "F")
-    make_module_simple_deps(reporoot, "G")
-    make_module_simple_deps(reporoot, "H")
-    make_module_simple_deps(reporoot, "I")
-    make_module_simple_deps(reporoot, "J")
+    make_module_simple_deps(reporoot, "a", ["b", "c", "d"], project=True)
+    make_module_simple_deps(reporoot, "b")
+    c = make_module_simple_deps(reporoot, "c", ["e", "f", "e::a"], version="3.0")
+    add_file(c, "model/a.cf", "import modi", "add mod c::a", "3.2")
+    make_module_simple_deps(reporoot, "d", ["f", "g"])
+    e = make_module_simple_deps(reporoot, "e", ["h"], version="3.0")
+    add_file(e, "model/a.cf", "import modj", "add mod e::a", "3.2")
+    make_module_simple_deps(reporoot, "f")
+    make_module_simple_deps(reporoot, "g")
+    make_module_simple_deps(reporoot, "h")
+    make_module_simple_deps(reporoot, "i")
+    make_module_simple_deps(reporoot, "j")
 
     return reporoot

tests/moduletool/test_freeze.py

@@ -32,42 +32,42 @@
 
 @pytest.mark.slowtest
 def test_freeze_basic(git_modules_dir: str, modules_repo: str, tmpdir):
-    install_project(git_modules_dir, "projectA", tmpdir)
+    install_project(git_modules_dir, "projecta", tmpdir)
     modtool = ModuleTool()
-    cmod = modtool.get_module("modC")
-    assert cmod.get_freeze("modC", recursive=False, mode="==") == {"std": "== 3.2", "modE": "== 3.2", "modF": "== 3.2"}
-    assert cmod.get_freeze("modC", recursive=True, mode="==") == {
+    cmod = modtool.get_module("modc")
+    assert cmod.get_freeze("modc", recursive=False, mode="==") == {"std": "== 3.2", "mode": "== 3.2", "modf": "== 3.2"}
+    assert cmod.get_freeze("modc", recursive=True, mode="==") == {
         "std": "== 3.2",
-        "modE": "== 3.2",
-        "modF": "== 3.2",
-        "modH": "== 3.2",
-        "modJ": "== 3.2",
+        "mode": "== 3.2",
+        "modf": "== 3.2",
+        "modh": "== 3.2",
+        "modj": "== 3.2",
     }
 
-    assert cmod.get_freeze("modC::a", recursive=False, mode="==") == {"std": "== 3.2", "modI": "== 3.2"}
+    assert cmod.get_freeze("modc::a", recursive=False, mode="==") == {"std": "== 3.2", "modi": "== 3.2"}
 
 
 @pytest.mark.slowtest
 def test_project_freeze_basic(git_modules_dir: str, modules_repo: str, tmpdir):
-    install_project(git_modules_dir, "projectA", tmpdir)
+    install_project(git_modules_dir, "projecta", tmpdir)
     modtool = ModuleTool()
     proj = modtool.get_project()
     assert proj.get_freeze(recursive=False, mode="==") == {
         "std": "== 3.2",
-        "modB": "== 3.2",
-        "modC": "== 3.2",
-        "modD": "== 3.2",
+        "modb": "== 3.2",
+        "modc": "== 3.2",
+        "modd": "== 3.2",
     }
     assert proj.get_freeze(recursive=True, mode="==") == {
         "std": "== 3.2",
-        "modB": "== 3.2",
-        "modC": "== 3.2",
-        "modD": "== 3.2",
-        "modE": "== 3.2",
-        "modF": "== 3.2",
-        "modG": "== 3.2",
-        "modH": "== 3.2",
-        "modJ": "== 3.2",
+        "modb": "== 3.2",
+        "modc": "== 3.2",
+        "modd": "== 3.2",
+        "mode": "== 3.2",
+        "modf": "== 3.2",
+        "modg": "== 3.2",
+        "modh": "== 3.2",
+        "modj": "== 3.2",
     }
 
 
@@ -85,7 +85,7 @@ def test_project_freeze_bad(git_modules_dir: str, modules_repo: str, tmpdir):
 
 @pytest.mark.slowtest
 def test_project_freeze(git_modules_dir: str, modules_repo: str, capsys, tmpdir):
-    coroot = install_project(git_modules_dir, "projectA", tmpdir)
+    coroot = install_project(git_modules_dir, "projecta", tmpdir)
 
     app(["project", "freeze", "-o", "-"])
 
@@ -95,16 +95,16 @@ def test_project_freeze(git_modules_dir: str, modules_repo: str, capsys, tmpdir)
     assert len(err) == 0, err
     assert (
         out
-        == """name: projectA
+        == """name: projecta
 license: Apache 2.0
 version: 0.0.1
 modulepath: libs
 downloadpath: libs
 repo: %s
 requires:
-- modB ~= 3.2
-- modC ~= 3.2
-- modD ~= 3.2
+- modb ~= 3.2
+- modc ~= 3.2
+- modd ~= 3.2
 - std ~= 3.2
 """
         % modules_repo
@@ -113,7 +113,7 @@ def test_project_freeze(git_modules_dir: str, modules_repo: str, capsys, tmpdir)
 
 @pytest.mark.slowtest
 def test_project_freeze_disk(git_modules_dir: str, modules_repo: str, capsys, tmpdir):
-    coroot = install_project(git_modules_dir, "projectA", tmpdir)
+    coroot = install_project(git_modules_dir, "projecta", tmpdir)
 
     app(["project", "freeze"])
 
@@ -125,16 +125,16 @@ def test_project_freeze_disk(git_modules_dir: str, modules_repo: str, capsys, tm
     with open(os.path.join(coroot, "project.yml"), encoding="utf-8") as fh:
         assert (
             fh.read()
-            == """name: projectA
+            == """name: projecta
 license: Apache 2.0
 version: 0.0.1
 modulepath: libs
 downloadpath: libs
 repo: %s
 requires:
-- modB ~= 3.2
-- modC ~= 3.2
-- modD ~= 3.2
+- modb ~= 3.2
+- modc ~= 3.2
+- modd ~= 3.2
 - std ~= 3.2
 """
             % modules_repo
@@ -143,7 +143,7 @@ def test_project_freeze_disk(git_modules_dir: str, modules_repo: str, capsys, tm
 
 @pytest.mark.slowtest
 def test_project_freeze_odd_opperator(git_modules_dir: str, modules_repo: str, tmpdir):
-    coroot = install_project(git_modules_dir, "projectA", tmpdir)
+    coroot = install_project(git_modules_dir, "projecta", tmpdir)
 
     # Start a new subprocess, because inmanta-cli executes sys.exit() when an invalid argument is used.
     process = subprocess.Popen(
@@ -165,10 +165,10 @@ def test_project_freeze_odd_opperator(git_modules_dir: str, modules_repo: str, t
 def test_project_options_in_config(git_modules_dir: str, modules_repo: str, capsys, tmpdir):
     coroot = install_project(
         git_modules_dir,
-        "projectA",
+        "projecta",
         tmpdir,
         config_content=f"""
-name: projectA
+name: projecta
 license: Apache 2.0
 version: 0.0.1
 modulepath: libs
@@ -188,7 +188,7 @@ def verify():
 
         with open("project.yml", encoding="utf-8") as fh:
             assert fh.read() == (
-                """name: projectA
+                """name: projecta
 license: Apache 2.0
 version: 0.0.1
 modulepath: libs
@@ -197,14 +197,14 @@ def verify():
 freeze_recursive: true
 freeze_operator: ==
 requires:
-- modB == 3.2
-- modC == 3.2
-- modD == 3.2
-- modE == 3.2
-- modF == 3.2
-- modG == 3.2
-- modH == 3.2
-- modJ == 3.2
+- modb == 3.2
+- modc == 3.2
+- modd == 3.2
+- mode == 3.2
+- modf == 3.2
+- modg == 3.2
+- modh == 3.2
+- modj == 3.2
 - std == 3.2
 """
                 % modules_repo
@@ -218,58 +218,58 @@ def verify():
 
 @pytest.mark.slowtest
 def test_module_freeze(git_modules_dir: str, modules_repo: str, capsys, tmpdir):
-    coroot = install_project(git_modules_dir, "projectA", tmpdir)
+    coroot = install_project(git_modules_dir, "projecta", tmpdir)
 
     def verify():
         out, err = capsys.readouterr()
 
         assert os.path.getsize(os.path.join(coroot, "project.yml")) != 0
         assert len(err) == 0, err
         assert out == (
-            """name: modC
+            """name: modc
 license: Apache 2.0
 version: '3.2'
 requires:
-- modE ~= 3.2
-- modF ~= 3.2
-- modI ~= 3.2
+- mode ~= 3.2
+- modf ~= 3.2
+- modi ~= 3.2
 - std ~= 3.2
 """
         )
 
-    app(["module", "-m", "modC", "freeze", "-o", "-"])
+    app(["module", "-m", "modc", "freeze", "-o", "-"])
     verify()
 
 
 @pytest.mark.slowtest
 def test_module_freeze_self_disk(git_modules_dir: str, modules_repo: str, capsys, tmpdir):
-    coroot = install_project(git_modules_dir, "projectA", tmpdir)
+    coroot = install_project(git_modules_dir, "projecta", tmpdir)
 
     def verify():
         out, err = capsys.readouterr()
 
         assert len(err) == 0, err
         assert len(out) == 0, out
 
-        modpath = os.path.join(coroot, "libs/modC/module.yml")
+        modpath = os.path.join(coroot, "libs/modc/module.yml")
         assert os.path.getsize(os.path.join(coroot, "project.yml")) != 0
         assert os.path.getsize(modpath) != 0
 
         with open(modpath, encoding="utf-8") as fh:
             outf = fh.read()
             assert outf == (
-                """name: modC
+                """name: modc
 license: Apache 2.0
 version: '3.2'
 requires:
-- modE ~= 3.2
-- modF ~= 3.2
-- modI ~= 3.2
+- mode ~= 3.2
+- modf ~= 3.2
+- modi ~= 3.2
 - std ~= 3.2
 """
             )
 
-    modp = os.path.join(coroot, "libs/modC")
+    modp = os.path.join(coroot, "libs/modc")
     app(["project", "install"])
     os.chdir(modp)
     app(["module", "freeze"])