Fix tests

Author: dolfinus

setuptools_git_versioning.py

@@ -103,7 +103,7 @@ def get_tags(
     root: str | os.PathLike | None = None,
 ) -> list[str]:
     """Return list of tags merged into HEAD history tree"""
-    tags = _exec("git", "tag", f"--sort=-{sort_by} --merged", root=root)
+    tags = _exec("git", "tag", f"--sort=-{sort_by}", "--merged", root=root)
     if filter_callback:
         # pull the tags that don't start with tag_prefix out of the list
         return list(filter(filter_callback, tags))

tests/conftest.py

@@ -1,5 +1,4 @@
 import os
-import shutil
 import textwrap
 from pathlib import Path
 
@@ -11,8 +10,8 @@
 
 
 @pytest.fixture
-def repo_dir(temp_path_factory: pytest.TempPathFactory):
-    repo_dir = temp_path_factory.mktemp("repo")
+def repo_dir(tmp_path_factory: pytest.TempPathFactory):
+    repo_dir = tmp_path_factory.mktemp("repo")
     coveragerc = root.joinpath(".coveragerc")
     reports = repo_dir.joinpath("reports")
 
@@ -26,9 +25,8 @@ def repo_dir(temp_path_factory: pytest.TempPathFactory):
 
     if os.environ.get("CI", "false").lower() in ["1", "true"]:
         # move collect coverage data to reports directory
-        for root_path, _dirs, files in os.walk(reports):
-            for file in files:
-                shutil.move(root_path / file, reports / file)
+        for file in reports.glob("*"):
+            file.rename(reports / file.name)
 
 
 @pytest.fixture

tests/lib/util.py

@@ -306,7 +306,7 @@ def get_version_setup_py(cwd: str | os.PathLike, **kwargs) -> str:
 
 
 def get_version_module(cwd: str | os.PathLike, args: list[str] | None = None, **kwargs) -> str:
-    args_str = " ".join(args or [])
+    args_str = " ".join(map(str, args or []))
 
     return execute(
         cwd,
@@ -316,7 +316,7 @@ def get_version_module(cwd: str | os.PathLike, args: list[str] | None = None, **
 
 
 def get_version_script(cwd: str | os.PathLike, args: list[str] | None = None, **kwargs) -> str:
-    args_str = " ".join(args or [])
+    args_str = " ".join(map(str, args or []))
     return execute(cwd, f"setuptools-git-versioning {args_str} -vv", **kwargs).strip()