From a7901c7c179c06afd07133d1593f89ef3bcae2fe Mon Sep 17 00:00:00 2001 From: Gabriel Dugny Date: Sun, 24 Mar 2024 16:58:45 +0100 Subject: [PATCH 1/4] chore: use src layout --- setup.py | 6 ++++-- {django_components => src/django_components}/__init__.py | 0 .../django_components}/app_settings.py | 0 {django_components => src/django_components}/apps.py | 0 {django_components => src/django_components}/component.py | 0 .../django_components}/component_registry.py | 0 {django_components => src/django_components}/logger.py | 0 .../django_components}/management/__init__.py | 0 .../django_components}/management/commands/__init__.py | 0 .../management/commands/startcomponent.py | 0 .../management/commands/upgradecomponent.py | 0 {django_components => src/django_components}/middleware.py | 0 {django_components => src/django_components}/py.typed | 0 .../django_components}/safer_staticfiles/__init__.py | 0 .../django_components}/safer_staticfiles/apps.py | 0 .../django_components}/template_loader.py | 0 .../django_components}/templatetags/__init__.py | 0 .../django_components}/templatetags/component_tags.py | 0 {django_components => src/django_components}/types.py | 0 {django_components => src/django_components}/utils.py | 0 20 files changed, 4 insertions(+), 2 deletions(-) rename {django_components => src/django_components}/__init__.py (100%) rename {django_components => src/django_components}/app_settings.py (100%) rename {django_components => src/django_components}/apps.py (100%) rename {django_components => src/django_components}/component.py (100%) rename {django_components => src/django_components}/component_registry.py (100%) rename {django_components => src/django_components}/logger.py (100%) rename {django_components => src/django_components}/management/__init__.py (100%) rename {django_components => src/django_components}/management/commands/__init__.py (100%) rename {django_components => src/django_components}/management/commands/startcomponent.py (100%) rename {django_components => src/django_components}/management/commands/upgradecomponent.py (100%) rename {django_components => src/django_components}/middleware.py (100%) rename {django_components => src/django_components}/py.typed (100%) rename {django_components => src/django_components}/safer_staticfiles/__init__.py (100%) rename {django_components => src/django_components}/safer_staticfiles/apps.py (100%) rename {django_components => src/django_components}/template_loader.py (100%) rename {django_components => src/django_components}/templatetags/__init__.py (100%) rename {django_components => src/django_components}/templatetags/component_tags.py (100%) rename {django_components => src/django_components}/types.py (100%) rename {django_components => src/django_components}/utils.py (100%) diff --git a/setup.py b/setup.py index 6254eceb..c5919747 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,15 @@ # -*- coding: utf-8 -*- import os -from setuptools import find_packages, setup +from setuptools import setup VERSION = "0.61" setup( name="django_components", - packages=find_packages(exclude=["tests"]), + package_dir={ + "django_components": "src/django_components" + }, 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 From 44f984c84b950b674509ce0c1cb6e653dcc97550 Mon Sep 17 00:00:00 2001 From: Gabriel Dugny Date: Sun, 24 Mar 2024 16:58:59 +0100 Subject: [PATCH 2/4] fix: make tox use the wheel --- pyproject.toml | 11 +++++++++-- tox.ini | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) 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/tox.ini b/tox.ini index 26876cae..9a3ca247 100644 --- a/tox.ini +++ b/tox.ini @@ -30,6 +30,8 @@ python = fail_on_no_env = True [testenv] +package = wheel +wheel_build_env = .pkg deps = django32: Django>=3.2,<3.3 django40: Django>=4.0,<4.1 @@ -55,7 +57,7 @@ commands = changedir = {toxinidir} deps = isort commands = - isort --check-only --diff django_components + isort --check-only --diff src/django_components [testenv:coverage] changedir = {toxinidir} From a818f18423281c88c326c2818ea3b304df88fdd2 Mon Sep 17 00:00:00 2001 From: Gabriel Dugny Date: Sun, 24 Mar 2024 17:36:07 +0100 Subject: [PATCH 3/4] fix: support legacy tox and setuptools for Python 3.6 --- setup.py | 9 ++++----- tox.ini | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index c5919747..8660c11c 100644 --- a/setup.py +++ b/setup.py @@ -1,17 +1,16 @@ # -*- coding: utf-8 -*- import os -from setuptools import setup +from setuptools import find_packages, setup VERSION = "0.61" setup( name="django_components", - package_dir={ - "django_components": "src/django_components" - }, + packages=find_packages(where="src", exclude=["tests", "tests.*"]), + package_dir={"": "src"}, package_data={ - "django_components": ["py.typed"], + "django_components": ["py.typed"], }, version=VERSION, description="A way to create simple reusable template components in Django.", diff --git a/tox.ini b/tox.ini index 9a3ca247..ac06885d 100644 --- a/tox.ini +++ b/tox.ini @@ -29,6 +29,8 @@ 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 From 05fbd70b323db0438f3190e10ddb7b3a34730112 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 24 Mar 2024 16:37:09 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8660c11c..a227d3ea 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( packages=find_packages(where="src", exclude=["tests", "tests.*"]), package_dir={"": "src"}, package_data={ - "django_components": ["py.typed"], + "django_components": ["py.typed"], }, version=VERSION, description="A way to create simple reusable template components in Django.",