iker-python-setup 1.0.13__tar.gz → 1.0.15__tar.gz

{iker_python_setup-1.0.13 → iker_python_setup-1.0.15}/.github/workflows/pr.yml

@@ -21,6 +21,7 @@ jobs:
 
       - name: Build and Test
         run: |
+          sudo apt-get update
           sudo apt-get install libxml2-dev libxslt1-dev llvm-14-dev
           python -m pip install --upgrade pip
           python -m pip install .[test]
@@ -39,6 +40,7 @@ jobs:
 
       - name: Build and Test
         run: |
+          sudo apt-get update
           sudo apt-get install libxml2-dev libxslt1-dev llvm-14-dev
           python -m pip install --upgrade pip
           python -m pip install .[test]
@@ -57,6 +59,7 @@ jobs:
 
       - name: Build and Test
         run: |
+          sudo apt-get update
           sudo apt-get install libxml2-dev libxslt1-dev llvm-14-dev
           python -m pip install --upgrade pip
           python -m pip install .[test]

{iker_python_setup-1.0.13 → iker_python_setup-1.0.15}/.github/workflows/push.yml

@@ -21,6 +21,7 @@ jobs:
 
       - name: Build and Upload
         run: |
+          sudo apt-get update
           sudo apt-get install libxml2-dev libxslt1-dev llvm-14-dev
           python -m pip install --upgrade pip build twine
           python -m pip install .[test]

{iker_python_setup-1.0.13 → iker_python_setup-1.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: iker-python-setup
-Version: 1.0.13
+Version: 1.0.15
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{iker_python_setup-1.0.13 → iker_python_setup-1.0.15}/pyproject.toml

@@ -37,10 +37,10 @@ where = ["src"]
 namespaces = true
 
 [tool.pytest.ini_options]
-pythonpath = ["test"]
+pythonpath = ["src"]
 
 [tool.coverage.run]
+branch = true
 include = [
-    "src/iker/setup/*",
-    "*/site-packages/iker/setup/*",
+    "src/iker/*",
 ]

{iker_python_setup-1.0.13 → iker_python_setup-1.0.15}/src/iker/setup/__init__.py

@@ -1,6 +1,8 @@
 import importlib.metadata
 import os
 
+import setuptools
+
 try:
     __version__ = importlib.metadata.version("iker-python-setup")
 except importlib.metadata.PackageNotFoundError:
@@ -44,8 +46,7 @@ def version_string_scm(cwd: str | None,
                        patch_env_var: str,
                        scm_branch_name: str,
                        scm_branch_env_var: str) -> str:
-    from setuptools_scm import ScmVersion
-    from setuptools_scm import get_version
+    import setuptools_scm
     if cwd is None:
         cwd = os.getcwd()
 
@@ -59,23 +60,23 @@ def version_string_scm(cwd: str | None,
             raise ValueError("Cannot find SCM root properly")
         return find_scm_root(pd)
 
-    def version_scheme_callback(scm_version: ScmVersion) -> str:
+    def version_scheme_callback(scm_version: setuptools_scm.ScmVersion) -> str:
         major, minor, patch = read_version_tuple(cwd, version_file=version_file, patch_env_var=patch_env_var)
         if scm_version.branch == scm_branch_name or os.getenv(scm_branch_env_var) == scm_branch_name:
             return f"{major}.{minor}.{patch}"
         return f"{major}.{minor}.{0}"
 
-    def local_scheme_callback(scm_version: ScmVersion) -> str:
+    def local_scheme_callback(scm_version: setuptools_scm.ScmVersion) -> str:
         if scm_version.branch == scm_branch_name or os.getenv(scm_branch_env_var) == scm_branch_name:
             return ""
         if scm_version.dirty:
             return scm_version.format_with("+{node}.dirty")
         return scm_version.format_with("+{node}")
 
-    return get_version(root=find_scm_root(cwd),
-                       version_scheme=version_scheme_callback,
-                       local_scheme=local_scheme_callback,
-                       normalize=True)
+    return setuptools_scm.get_version(root=find_scm_root(cwd),
+                                      version_scheme=version_scheme_callback,
+                                      local_scheme=local_scheme_callback,
+                                      normalize=True)
 
 
 def version_string(cwd: str | None = None,
@@ -106,5 +107,4 @@ def version_string(cwd: str | None = None,
 
 
 def setup(cwd: str | None = None, **kwargs):
-    from setuptools import setup
-    setup(version=version_string(cwd, **kwargs), **kwargs)
+    setuptools.setup(version=version_string(cwd, **kwargs), **kwargs)

{iker_python_setup-1.0.13 → iker_python_setup-1.0.15}/src/iker_python_setup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: iker-python-setup
-Version: 1.0.13
+Version: 1.0.15
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{iker_python_setup-1.0.13 → iker_python_setup-1.0.15}/test/iker_tests/setup_test.py

@@ -17,6 +17,15 @@ class Test(unittest.TestCase):
         self.assertEqual(minor, 2)
         self.assertEqual(patch, 3)
 
+    def test_read_version_tuple__none_cwd(self):
+        with unittest.mock.patch("os.getcwd", return_value=os.path.join(resources_directory, "unittest/setup")):
+            major, minor, patch = iker.setup.read_version_tuple(None,
+                                                                version_file="VERSION",
+                                                                patch_env_var="DUMMY_BUILD")
+        self.assertEqual(major, 1)
+        self.assertEqual(minor, 2)
+        self.assertEqual(patch, 3)
+
     def test_read_version_tuple__excessive_patch(self):
         major, minor, patch = iker.setup.read_version_tuple(os.path.join(resources_directory, "unittest/setup"),
                                                             version_file="VERSION_EXCESSIVE_PATCH",
@@ -92,6 +101,16 @@ class Test(unittest.TestCase):
         self.assertTrue(version_string.startswith("1.2.0"))
         self.assertTrue(re.match(r"^\d+\.\d+\.\d+(\+g[0-9a-f]{7}(\.dirty)?)?$", version_string))
 
+    def test_version_string_scm__none_cwd(self):
+        with unittest.mock.patch("os.getcwd", return_value=os.path.join(resources_directory, "unittest/setup")):
+            version_string = iker.setup.version_string_scm(None,
+                                                           version_file="VERSION",
+                                                           patch_env_var="DUMMY_BUILD",
+                                                           scm_branch_name="dummy_branch",
+                                                           scm_branch_env_var="DUMMY_BRANCH")
+        self.assertTrue(version_string.startswith("1.2.0"))
+        self.assertTrue(re.match(r"^\d+\.\d+\.\d+(\+g[0-9a-f]{7}(\.dirty)?)?$", version_string))
+
     def test_version_string_scm__env_branch(self):
         with unittest.mock.patch.dict(os.environ, {"DUMMY_BRANCH": "dummy_branch"}):
             version_string = iker.setup.version_string_scm(os.path.join(resources_directory, "unittest/setup"),
@@ -101,6 +120,17 @@ class Test(unittest.TestCase):
                                                            scm_branch_env_var="DUMMY_BRANCH")
         self.assertEqual(version_string, "1.2.3")
 
+    def test_version_string_scm__scm_root_not_found(self):
+        with (
+            unittest.mock.patch("os.listdir", return_value=[]),
+            self.assertRaises(ValueError),
+        ):
+            iker.setup.version_string_scm(os.path.join(resources_directory, "unittest/setup"),
+                                          version_file="VERSION",
+                                          patch_env_var="DUMMY_BUILD",
+                                          scm_branch_name="dummy_branch",
+                                          scm_branch_env_var="DUMMY_BRANCH")
+
     def test_version_string(self):
         version_string = iker.setup.version_string(os.path.join(resources_directory, "unittest/setup"),
                                                    version_file="VERSION",
@@ -130,7 +160,7 @@ class Test(unittest.TestCase):
 
     def test_version_string__with_exception_raised(self):
         with (
-            (unittest.mock.patch("iker.setup.version_string_scm", side_effect=Exception())),
+            unittest.mock.patch("iker.setup.version_string_scm", side_effect=Exception()),
             self.assertRaises(Exception),
         ):
             iker.setup.version_string(os.path.join(resources_directory, "unittest/setup"),
@@ -139,3 +169,15 @@ class Test(unittest.TestCase):
                                       scm_branch_name="dummy_branch",
                                       scm_branch_env_var="DUMMY_BRANCH",
                                       strict=True)
+
+    def test_version_string__default_fallback(self):
+        with (
+            unittest.mock.patch("iker.setup.version_string_scm", side_effect=Exception()),
+            unittest.mock.patch("iker.setup.version_string_local", side_effect=Exception()),
+        ):
+            version_string = iker.setup.version_string(os.path.join(resources_directory, "unittest/setup"),
+                                                       version_file="VERSION",
+                                                       patch_env_var="DUMMY_BUILD",
+                                                       scm_branch_name="dummy_branch",
+                                                       scm_branch_env_var="DUMMY_BRANCH")
+        self.assertEqual(version_string, "0.0.0")