Merge pull request #33 from jwbargsten/fix-tests-in-dist

jwbargsten · Dec 18, 2023 · 8b51f4a · 8b51f4a
2 parents cdee7ab + af73510
commit 8b51f4a
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 12 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,5 @@
 exclude .*
 prune .github
 include Makefile
-recursive-include pytest_archon *.txt
-include pytest_archon/py.typed
+recursive-include src/pytest_archon *.txt
+include src/pytest_archon/py.typed
diff --git a/Makefile b/Makefile
@@ -11,10 +11,10 @@ test: $(VENV)/init ## run pytest
 	. $(VENV)/bin/activate && pytest -rA -vvs --log-level INFO
 
 cov: $(VENV)/init ## run pytest
-	. $(VENV)/bin/activate && coverage run --source=pytest_archon --module pytest && coverage report
+	. $(VENV)/bin/activate && coverage run --module pytest && coverage report
 
 lint: $(VENV)/init ## run flake8 to check the code
-	. $(VENV)/bin/activate && flake8 pytest_archon tests && mypy -m pytest_archon
+	. $(VENV)/bin/activate && flake8 src/ tests/ && mypy -m pytest_archon
 
 install-editable: $(VENV)/init
 	. $(VENV)/bin/activate && $(PIP) install -e '.[dev]'
@@ -23,10 +23,10 @@ install: $(VENV)/init
 	. $(VENV)/bin/activate && $(PIP) install '.[dev]'
 
 fmt: $(VENV)/init ## run black to format the code
-	. $(VENV)/bin/activate && black pytest_archon tests
+	. $(VENV)/bin/activate && black src/ tests/
 
 fmt-check: $(VENV)/init ## run black to format the code
-	. $(VENV)/bin/activate && black --check pytest_archon tests
+	. $(VENV)/bin/activate && black --check src/ tests/
 
 clean:
 	rm -rf dist/ build/ *.egg-info

diff --git a/pyproject.toml b/pyproject.toml
@@ -44,9 +44,6 @@ dev = [
 
 [tool.setuptools_scm]
 
-[tool.setuptools.packages.find]
-namespaces = true
-
 [tool.setuptools.package-data]
 "pytest_archon.assets" = ["*.txt"]
 
@@ -58,9 +55,10 @@ profile = "black"
 line_length = 110
 
 [tool.pytest.ini_options]
-addopts = [
-    "--import-mode=importlib",
-]
+pythonpath = [ "src", "tests" ]
 
 [project.entry-points.pytest11]
 arch = "pytest_archon.plugin"
+
+[tool.coverage.paths]
+source = ["src"]
diff --git a/pytest_archon/__init__.py → src/pytest_archon/__init__.py b/pytest_archon/__init__.py → src/pytest_archon/__init__.py
diff --git a/...t_archon/assets/core-module-lists/3.6.txt → ...t_archon/assets/core-module-lists/3.6.txt b/...t_archon/assets/core-module-lists/3.6.txt → ...t_archon/assets/core-module-lists/3.6.txt
diff --git a/...t_archon/assets/core-module-lists/3.7.txt → ...t_archon/assets/core-module-lists/3.7.txt b/...t_archon/assets/core-module-lists/3.7.txt → ...t_archon/assets/core-module-lists/3.7.txt
diff --git a/...t_archon/assets/core-module-lists/3.8.txt → ...t_archon/assets/core-module-lists/3.8.txt b/...t_archon/assets/core-module-lists/3.8.txt → ...t_archon/assets/core-module-lists/3.8.txt
diff --git a/...t_archon/assets/core-module-lists/3.9.txt → ...t_archon/assets/core-module-lists/3.9.txt b/...t_archon/assets/core-module-lists/3.9.txt → ...t_archon/assets/core-module-lists/3.9.txt
diff --git a/pytest_archon/collect.py → src/pytest_archon/collect.py b/pytest_archon/collect.py → src/pytest_archon/collect.py
diff --git a/pytest_archon/core_modules.py → src/pytest_archon/core_modules.py b/pytest_archon/core_modules.py → src/pytest_archon/core_modules.py
diff --git a/pytest_archon/failure.py → src/pytest_archon/failure.py b/pytest_archon/failure.py → src/pytest_archon/failure.py
diff --git a/pytest_archon/plugin.py → src/pytest_archon/plugin.py b/pytest_archon/plugin.py → src/pytest_archon/plugin.py
diff --git a/pytest_archon/py.typed → src/pytest_archon/py.typed b/pytest_archon/py.typed → src/pytest_archon/py.typed
diff --git a/pytest_archon/rule.py → src/pytest_archon/rule.py b/pytest_archon/rule.py → src/pytest_archon/rule.py