Correct source file paths for projects with src/ layout and those using namespace packages,

Author: domdfcoding

repo_helper/build.py

@@ -140,17 +140,26 @@ def copy_source(self) -> None:
 		Copy source files into the build directory.
 		"""
 
-		pkgdir = self.repo_dir / self.import_name
-
-		for py_pattern in {"**/*.py", "**/*.pyi", "**/*.pyx", "**/py.typed"}:
-			for py_file in pkgdir.rglob(py_pattern):
-				if "__pycache__" in py_file.parts:
-					continue
-
-				target = self.build_dir / py_file.relative_to(self.repo_dir)
-				target.parent.maybe_make(parents=True)
-				target.write_clean(py_file.read_text())
-				self.report_copied(py_file, target)
+		source_files = []
+
+		if self.config["py_modules"]:
+			source_files.extend(self.config["py_modules"])
+		else:
+			if self.config["stubs_package"]:
+				pkgdir = self.repo_dir / self.config["source_dir"] / f"{self.config['import_name'].replace('.', '/')}-stubs"
+			else:
+				pkgdir = self.repo_dir / self.config["source_dir"] / self.config["import_name"].replace(".", "/")
+
+			for py_pattern in {"**/*.py", "**/*.pyi", "**/*.pyx", "**/py.typed"}:
+				for py_file in pkgdir.rglob(py_pattern):
+					if "__pycache__" not in py_file.parts:
+						source_files.append(py_file)
+
+		for py_file in source_files:
+			target = self.build_dir / py_file.relative_to(self.repo_dir)
+			target.parent.maybe_make(parents=True)
+			target.write_clean(py_file.read_text())
+			self.report_copied(py_file, target)
 
 	def report_copied(self, source: pathlib.Path, target: pathlib.Path):
 		"""

repo_helper/files/testing.py

@@ -26,6 +26,7 @@
 # stdlib
 import os.path
 import pathlib
+import posixpath
 import re
 from typing import Any, List
 
@@ -103,17 +104,16 @@ def get_source_files(self) -> List[str]:
 		source_files = []
 
 		if self._globals["py_modules"]:
-			source_files += self._globals["source_dir"]
 
 			for file in self._globals["py_modules"]:
-				source_files.append(f"{file}.py")
+				source_files.append(posixpath.join(self._globals["source_dir"], f"{file}.py"))
 
 		elif self._globals["stubs_package"]:
-			directory = f"{self._globals['source_dir']}{self._globals['import_name'].replace('.', '/')}-stubs"
+			directory = posixpath.join(self._globals["source_dir"], f"{self._globals['import_name'].replace('.', '/')}-stubs")
 			source_files.append(directory)
 
 		else:
-			directory = f"{self._globals['source_dir']}{self._globals['import_name'].replace('.', '/')}"
+			directory = posixpath.join(self._globals["source_dir"], self._globals["import_name"].replace(".", "/"))
 			source_files.append(directory)
 
 		if self._globals["enable_tests"]: