fix: Errors when using the editables backend with the includes fi…

…eld. Fixes #242 Signed-off-by: Frost Ming <[email protected]>
pdm-project · Jun 17, 2024 · 59396e3 · 59396e3
1 parent 8930817
commit 59396e3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/pdm/backend/config.py b/src/pdm/backend/config.py
@@ -118,7 +118,12 @@ def convert_package_paths(self) -> dict[str, list | dict]:
                     dir_name = include.rstrip("/\\")
                     temp = list(find_packages_iter(dir_name, src=package_dir or "."))
                     if os.path.isfile(os.path.join(dir_name, "__init__.py")):
-                        temp.insert(0, dir_name)
+                        temp.insert(
+                            0,
+                            os.path.relpath(dir_name, package_dir or None)
+                            .replace("\\", ".")
+                            .replace("/", "."),
+                        )
                     packages_set.update(temp)
                     includes.remove(include)
             packages[:] = list(packages_set)

diff --git a/tests/pdm/backend/hooks/version/test_scm.py b/tests/pdm/backend/hooks/version/test_scm.py
@@ -145,7 +145,8 @@ def scm_dir() -> Iterable:
 @pytest.fixture
 def git(scm_dir: Path) -> GitScm:
     git = shutil.which("git")
-    assert git is not None, "Cannot find git in path"
+    if git is None:
+        pytest.skip("Cannot find git in path")
 
     scm = GitScm(Path(git), scm_dir)
 
@@ -155,7 +156,8 @@ def git(scm_dir: Path) -> GitScm:
 @pytest.fixture
 def hg(scm_dir: Path) -> HgScm:
     hg = shutil.which("hg")
-    assert hg is not None, "Cannot find hg in path"
+    if hg is None:
+        pytest.skip("Cannot find hg in path")
 
     scm = HgScm(Path(hg), scm_dir)