diff --git a/pyproject.toml b/pyproject.toml index 7836e48d..168db0db 100644 --- 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' -] \ No newline at end of file + 'test_structures', + 'build', +] + +[tool.pytest.ini_options] +testpaths = [ + "tests" +] diff --git a/setup.py b/setup.py index 6254eceb..a227d3ea 100644 --- 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"], }, diff --git a/django_components/__init__.py b/src/django_components/__init__.py similarity index 100% rename from django_components/__init__.py rename to src/django_components/__init__.py diff --git a/django_components/app_settings.py b/src/django_components/app_settings.py similarity index 100% rename from django_components/app_settings.py rename to src/django_components/app_settings.py diff --git a/django_components/apps.py b/src/django_components/apps.py similarity index 100% rename from django_components/apps.py rename to src/django_components/apps.py diff --git a/django_components/component.py b/src/django_components/component.py similarity index 100% rename from django_components/component.py rename to src/django_components/component.py diff --git a/django_components/component_registry.py b/src/django_components/component_registry.py similarity index 100% rename from django_components/component_registry.py rename to src/django_components/component_registry.py diff --git a/django_components/logger.py b/src/django_components/logger.py similarity index 100% rename from django_components/logger.py rename to src/django_components/logger.py diff --git a/django_components/management/__init__.py b/src/django_components/management/__init__.py similarity index 100% rename from django_components/management/__init__.py rename to src/django_components/management/__init__.py diff --git a/django_components/management/commands/__init__.py b/src/django_components/management/commands/__init__.py similarity index 100% rename from django_components/management/commands/__init__.py rename to src/django_components/management/commands/__init__.py diff --git a/django_components/management/commands/startcomponent.py b/src/django_components/management/commands/startcomponent.py similarity index 100% rename from django_components/management/commands/startcomponent.py rename to src/django_components/management/commands/startcomponent.py diff --git a/django_components/management/commands/upgradecomponent.py b/src/django_components/management/commands/upgradecomponent.py similarity index 100% rename from django_components/management/commands/upgradecomponent.py rename to src/django_components/management/commands/upgradecomponent.py diff --git a/django_components/middleware.py b/src/django_components/middleware.py similarity index 100% rename from django_components/middleware.py rename to src/django_components/middleware.py diff --git a/django_components/py.typed b/src/django_components/py.typed similarity index 100% rename from django_components/py.typed rename to src/django_components/py.typed diff --git a/django_components/safer_staticfiles/__init__.py b/src/django_components/safer_staticfiles/__init__.py similarity index 100% rename from django_components/safer_staticfiles/__init__.py rename to src/django_components/safer_staticfiles/__init__.py diff --git a/django_components/safer_staticfiles/apps.py b/src/django_components/safer_staticfiles/apps.py similarity index 100% rename from django_components/safer_staticfiles/apps.py rename to src/django_components/safer_staticfiles/apps.py diff --git a/django_components/template_loader.py b/src/django_components/template_loader.py similarity index 100% rename from django_components/template_loader.py rename to src/django_components/template_loader.py diff --git a/django_components/templatetags/__init__.py b/src/django_components/templatetags/__init__.py similarity index 100% rename from django_components/templatetags/__init__.py rename to src/django_components/templatetags/__init__.py diff --git a/django_components/templatetags/component_tags.py b/src/django_components/templatetags/component_tags.py similarity index 100% rename from django_components/templatetags/component_tags.py rename to src/django_components/templatetags/component_tags.py diff --git a/django_components/types.py b/src/django_components/types.py similarity index 100% rename from django_components/types.py rename to src/django_components/types.py diff --git a/django_components/utils.py b/src/django_components/utils.py similarity index 100% rename from django_components/utils.py rename to src/django_components/utils.py diff --git a/tox.ini b/tox.ini index 26876cae..ac06885d 100644 --- 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}