diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 19e4cbc..78ba215 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -18,22 +18,15 @@ jobs: fail-fast: false matrix: include: - # Django 4.2 - - django: "4.2" - django_group: "django42" + - django: "5.2" python: "3.10" - - django: "4.2" - django_group: "django42" + - django: "5.2" python: "3.11" - # Django 5.2 - django: "5.2" - django_group: "django52" python: "3.12" - django: "5.2" - django_group: "django52" python: "3.13" - django: "5.2" - django_group: "django52" python: "3.14" steps: @@ -46,7 +39,7 @@ jobs: - name: Install Packages run: | - uv sync --python ${{ matrix.python }} --extra tests --group ${{ matrix.django_group }} --no-default-groups + uv sync --python ${{ matrix.python }} --extra tests --no-default-groups - name: Run Tests run: | diff --git a/pyproject.toml b/pyproject.toml index 5b72828..a84deec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ classifiers = [ "Programming Language :: Python :: 3.14", ] dependencies = [ - "django>=4.2", + "django>=5.2", "requests>=2.34.2", "jwcrypto>=1.5.8", ] @@ -48,18 +48,6 @@ extended = [ "requests_mock==1.12.1", ] -[dependency-groups] -django42 = ["Django~=4.2"] -django52 = ["Django~=5.2"] - -[tool.uv] -conflicts = [ - [ - { group = "django42" }, - { group = "django52" }, - ], -] - [tool.uv.build-backend] module-name = "authorization_django" module-root = "" diff --git a/uv.lock b/uv.lock index 556608a..e4f9dc3 100644 --- a/uv.lock +++ b/uv.lock @@ -5,17 +5,13 @@ resolution-markers = [ "python_full_version >= '3.11'", "python_full_version < '3.11'", ] -conflicts = [[ - { package = "datapunt-authorization-django", group = "django42" }, - { package = "datapunt-authorization-django", group = "django52" }, -]] [[package]] name = "asgiref" version = "3.12.1" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "typing-extensions", marker = "python_full_version < '3.11' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, + { name = "typing-extensions", marker = "python_full_version < '3.11'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/e6/26/3b59f2bdae5f640389becb1f673cded775287f5fc4f816309d9ca9a3f93d/asgiref-3.12.1.tar.gz", hash = "sha256:59dcb51c272ad209d59bed5708a64a333083e86017d7fcdd67498eeab7784340", size = 42378, upload-time = "2026-07-14T09:56:18.087Z" } wheels = [ @@ -45,7 +41,7 @@ name = "cffi" version = "2.1.1" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "pycparser", marker = "implementation_name != 'PyPy' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, + { name = "pycparser", marker = "implementation_name != 'PyPy'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/9e/ef/008a1939e372c06329a3fce4279c02f328488f3526744906eeec3da7ad5f/cffi-2.1.1.tar.gz", hash = "sha256:dd31f52ea1086513bb9df30f8fcee9b8918323ae067a3d5b78bc826a000712be", size = 530807, upload-time = "2026-08-03T21:21:18.939Z" } wheels = [ @@ -452,7 +448,7 @@ wheels = [ [package.optional-dependencies] toml = [ - { name = "tomli", marker = "python_full_version <= '3.11' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, + { name = "tomli", marker = "python_full_version <= '3.11'" }, ] [[package]] @@ -460,8 +456,8 @@ name = "cryptography" version = "50.0.0" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "cffi", marker = "platform_python_implementation != 'PyPy' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, - { name = "typing-extensions", marker = "python_full_version < '3.11' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, + { name = "cffi", marker = "platform_python_implementation != 'PyPy'" }, + { name = "typing-extensions", marker = "python_full_version < '3.11'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/de/41/6cbdcf9142d00fe82836fbb51e503e58088575cf7a0fe1dbff6695bf0840/cryptography-50.0.0.tar.gz", hash = "sha256:eeac2acb5a20ed25e0ad6d1df9891a520b78b404266b6d11778f25d5d691a6c9", size = 880201, upload-time = "2026-07-31T14:25:10.11Z" } wheels = [ @@ -517,8 +513,7 @@ name = "datapunt-authorization-django" version = "2.2.0" source = { editable = "." } dependencies = [ - { name = "django", version = "4.2.30", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'group-29-datapunt-authorization-django-django42'" }, - { name = "django", version = "5.2.17", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'group-29-datapunt-authorization-django-django52' or extra != 'group-29-datapunt-authorization-django-django42'" }, + { name = "django" }, { name = "jwcrypto" }, { name = "requests" }, ] @@ -539,17 +534,9 @@ tests = [ { name = "requests-mock" }, ] -[package.dev-dependencies] -django42 = [ - { name = "django", version = "4.2.30", source = { registry = "https://pypi.org/simple" } }, -] -django52 = [ - { name = "django", version = "5.2.17", source = { registry = "https://pypi.org/simple" } }, -] - [package.metadata] requires-dist = [ - { name = "django", specifier = ">=4.2" }, + { name = "django", specifier = ">=5.2" }, { name = "djangorestframework", marker = "extra == 'extended'", specifier = "==3.17.2" }, { name = "drf-spectacular", marker = "extra == 'extended'", specifier = "==0.30.0" }, { name = "jwcrypto", specifier = ">=1.5.8" }, @@ -565,40 +552,14 @@ requires-dist = [ ] provides-extras = ["tests", "extended"] -[package.metadata.requires-dev] -django42 = [{ name = "django", specifier = "~=4.2" }] -django52 = [{ name = "django", specifier = "~=5.2" }] - -[[package]] -name = "django" -version = "4.2.30" -source = { registry = "https://pypi.org/simple" } -resolution-markers = [ - "python_full_version >= '3.11'", - "python_full_version < '3.11'", -] -dependencies = [ - { name = "asgiref", marker = "extra == 'group-29-datapunt-authorization-django-django42'" }, - { name = "sqlparse", marker = "extra == 'group-29-datapunt-authorization-django-django42'" }, - { name = "tzdata", marker = "(sys_platform == 'win32' and extra == 'group-29-datapunt-authorization-django-django42') or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/11/b5/f1a53dc68da6429d6e0345bb848161e2381a2e9f02700148911e8582c2b3/django-4.2.30.tar.gz", hash = "sha256:4ebc7a434e3819db6cf4b399fb5b3f536310a30e8486f08b66886840be84b37c", size = 10468707, upload-time = "2026-04-07T14:05:45.57Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/39/b7/a7c96f239cf91313a6589233fed55111c7063b26683b226802732c455dbc/django-4.2.30-py3-none-any.whl", hash = "sha256:4d07aaf1c62f9984842b67c2874ebbf7056a17be253860299b93ae1881faad65", size = 7997231, upload-time = "2026-04-07T14:05:38.241Z" }, -] - [[package]] name = "django" version = "5.2.17" source = { registry = "https://pypi.org/simple" } -resolution-markers = [ - "python_full_version >= '3.11'", - "python_full_version < '3.11'", -] dependencies = [ - { name = "asgiref", marker = "extra == 'group-29-datapunt-authorization-django-django52' or extra != 'group-29-datapunt-authorization-django-django42'" }, - { name = "sqlparse", marker = "extra == 'group-29-datapunt-authorization-django-django52' or extra != 'group-29-datapunt-authorization-django-django42'" }, - { name = "tzdata", marker = "(sys_platform == 'win32' and extra != 'group-29-datapunt-authorization-django-django42') or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, + { name = "asgiref" }, + { name = "sqlparse" }, + { name = "tzdata", marker = "sys_platform == 'win32'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/d5/d8/43e9d000519adceb189620b6869ff88031e046df91c2e9da72f8f6918399/django-5.2.17.tar.gz", hash = "sha256:9d4d93be539a18ab80d058eb515900e10951e04c537c5a6b394fc49528d3251f", size = 10889740, upload-time = "2026-08-04T15:04:03.173Z" } wheels = [ @@ -610,8 +571,7 @@ name = "djangorestframework" version = "3.17.2" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "django", version = "4.2.30", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'group-29-datapunt-authorization-django-django42'" }, - { name = "django", version = "5.2.17", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'group-29-datapunt-authorization-django-django52' or extra != 'group-29-datapunt-authorization-django-django42'" }, + { name = "django" }, ] sdist = { url = "https://files.pythonhosted.org/packages/3b/35/c96055e700fdff25da3a7b7756cfd1d4dc54f38b9bc6d6c5e19e3a0fdc20/djangorestframework-3.17.2.tar.gz", hash = "sha256:89ed713b6dc83e1539f214b7d10808ae19bb8511004beba886225da6d5c9dafa", size = 906683, upload-time = "2026-08-05T07:47:22.5Z" } wheels = [ @@ -623,8 +583,7 @@ name = "drf-spectacular" version = "0.30.0" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "django", version = "4.2.30", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'group-29-datapunt-authorization-django-django42'" }, - { name = "django", version = "5.2.17", source = { registry = "https://pypi.org/simple" }, marker = "extra == 'group-29-datapunt-authorization-django-django52' or extra != 'group-29-datapunt-authorization-django-django42'" }, + { name = "django" }, { name = "djangorestframework" }, { name = "inflection" }, { name = "jsonschema" }, @@ -641,7 +600,7 @@ name = "exceptiongroup" version = "1.3.1" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "typing-extensions", marker = "python_full_version < '3.11' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, + { name = "typing-extensions" }, ] sdist = { url = "https://files.pythonhosted.org/packages/50/79/66800aadf48771f6b62f7eb014e352e5d06856655206165d775e675a02c9/exceptiongroup-1.3.1.tar.gz", hash = "sha256:8b412432c6055b0b7d14c310000ae93352ed6754f70fa8f7c34141f91c4e3219", size = 30371, upload-time = "2025-11-21T23:01:54.787Z" } wheels = [ @@ -683,8 +642,8 @@ dependencies = [ { name = "attrs" }, { name = "jsonschema-specifications" }, { name = "referencing" }, - { name = "rpds-py", version = "0.30.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, - { name = "rpds-py", version = "2026.6.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, + { name = "rpds-py", version = "0.30.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" }, + { name = "rpds-py", version = "2026.6.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/b3/fc/e067678238fa451312d4c62bf6e6cf5ec56375422aee02f9cb5f909b3047/jsonschema-4.26.0.tar.gz", hash = "sha256:0c26707e2efad8aa1bfc5b7ce170f3fccc2e4918ff85989ba9ffa9facb2be326", size = 366583, upload-time = "2026-01-07T13:41:07.246Z" } wheels = [ @@ -757,13 +716,13 @@ name = "pytest" version = "9.1.1" source = { registry = "https://pypi.org/simple" } dependencies = [ - { name = "colorama", marker = "sys_platform == 'win32' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, - { name = "exceptiongroup", marker = "python_full_version < '3.11' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, + { name = "colorama", marker = "sys_platform == 'win32'" }, + { name = "exceptiongroup", marker = "python_full_version < '3.11'" }, { name = "iniconfig" }, { name = "packaging" }, { name = "pluggy" }, { name = "pygments" }, - { name = "tomli", marker = "python_full_version < '3.11' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, + { name = "tomli", marker = "python_full_version < '3.11'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/e4/47/b9efed96c114afcfa3c9d3fe98a76a1d14c74a9e266d397cf6eb64be5e01/pytest-9.1.1.tar.gz", hash = "sha256:1088fbde8f2b49d95a549a195707afa7a76a3ce9bcadc26b6d71f0ffda5fe313", size = 1636369, upload-time = "2026-06-19T10:58:32.857Z" } wheels = [ @@ -866,9 +825,9 @@ version = "0.37.0" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "attrs" }, - { name = "rpds-py", version = "0.30.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, - { name = "rpds-py", version = "2026.6.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, - { name = "typing-extensions", marker = "python_full_version < '3.13' or (extra == 'group-29-datapunt-authorization-django-django42' and extra == 'group-29-datapunt-authorization-django-django52')" }, + { name = "rpds-py", version = "0.30.0", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" }, + { name = "rpds-py", version = "2026.6.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" }, + { name = "typing-extensions", marker = "python_full_version < '3.13'" }, ] sdist = { url = "https://files.pythonhosted.org/packages/22/f5/df4e9027acead3ecc63e50fe1e36aca1523e1719559c499951bb4b53188f/referencing-0.37.0.tar.gz", hash = "sha256:44aefc3142c5b842538163acb373e24cce6632bd54bdb01b21ad5863489f50d8", size = 78036, upload-time = "2025-10-13T15:30:48.871Z" } wheels = [