Merge pull request #407 from GabDug/fix/tox-use-wheel

Use wheel in tests, adopt src layout
2025-09-26 15:39:08 +00:00 · 2024-03-29 07:56:06 +01:00 · 2024-03-29 07:56:06 +01:00 · c11f30ec7c
commit c11f30ec7c
parent f2c925e1e2 05fbd70b32
22 changed files with 16 additions and 4 deletions
--- a/pyproject.toml
+++ b/pyproject.toml
@ -35,11 +35,18 @@ exclude = [
  '.env',
  '.venv',
  '.tox',
+  'build',
 ]

 [tool.mypy]
 check_untyped_defs = true
 ignore_missing_imports = true
 exclude = [
-    'test_structures'
+    'test_structures',
+    'build',
+]
+
+[tool.pytest.ini_options]
+testpaths = [
+    "tests"
 ]
--- a/setup.py
+++ b/setup.py
@ -7,7 +7,8 @@ VERSION = "0.61"

 setup(
    name="django_components",
-    packages=find_packages(exclude=["tests"]),
+    packages=find_packages(where="src", exclude=["tests", "tests.*"]),
+    package_dir={"": "src"},
    package_data={
        "django_components": ["py.typed"],
    },
--- a/src/django_components/init.py
+++ b/src/django_components/init.py
--- a/src/django_components/app_settings.py
+++ b/src/django_components/app_settings.py
--- a/src/django_components/apps.py
+++ b/src/django_components/apps.py
--- a/src/django_components/component.py
+++ b/src/django_components/component.py
--- a/src/django_components/component_registry.py
+++ b/src/django_components/component_registry.py
--- a/src/django_components/logger.py
+++ b/src/django_components/logger.py
--- a/src/django_components/management/init.py
+++ b/src/django_components/management/init.py
--- a/src/django_components/management/commands/init.py
+++ b/src/django_components/management/commands/init.py
--- a/src/django_components/management/commands/startcomponent.py
+++ b/src/django_components/management/commands/startcomponent.py
--- a/src/django_components/management/commands/upgradecomponent.py
+++ b/src/django_components/management/commands/upgradecomponent.py
--- a/src/django_components/middleware.py
+++ b/src/django_components/middleware.py
--- a/src/django_components/py.typed
+++ b/src/django_components/py.typed
--- a/src/django_components/safer_staticfiles/init.py
+++ b/src/django_components/safer_staticfiles/init.py
--- a/src/django_components/safer_staticfiles/apps.py
+++ b/src/django_components/safer_staticfiles/apps.py
--- a/src/django_components/template_loader.py
+++ b/src/django_components/template_loader.py
--- a/src/django_components/templatetags/init.py
+++ b/src/django_components/templatetags/init.py
--- a/src/django_components/templatetags/component_tags.py
+++ b/src/django_components/templatetags/component_tags.py
--- a/src/django_components/types.py
+++ b/src/django_components/types.py
--- a/src/django_components/utils.py
+++ b/src/django_components/utils.py
--- a/tox.ini
+++ b/tox.ini
@ -29,7 +29,11 @@ python =
  3.12: py312-django{42,50}, flake8, isort, coverage, mypy
 fail_on_no_env = True

+isolated_build = true
+
 [testenv]
+package = wheel
+wheel_build_env = .pkg
 deps =
  django32: Django>=3.2,<3.3
  django40: Django>=4.0,<4.1
@ -55,7 +59,7 @@ commands =
 changedir = {toxinidir}
 deps = isort
 commands =
-  isort --check-only --diff django_components
+  isort --check-only --diff src/django_components

 [testenv:coverage]
 changedir = {toxinidir}