diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0f6491c..5f260084 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,14 +35,30 @@ jobs: TOXENV: py310-django42-djangorestframework314 - python: '3.11' TOXENV: py311-django42-djangorestframework314 + - python: '3.10' + TOXENV: py310-django50-djangorestframework315 - python: '3.11' TOXENV: py311-django50-djangorestframework315 - python: '3.12' TOXENV: py312-django50-djangorestframework315 + - python: '3.13' + TOXENV: py313-django50-djangorestframework315 + - python: '3.10' + TOXENV: py310-django51-djangorestframework315 - python: '3.11' TOXENV: py311-django51-djangorestframework315 - python: '3.12' TOXENV: py312-django51-djangorestframework315 + - python: '3.13' + TOXENV: py313-django51-djangorestframework315 + - python: '3.10' + TOXENV: py310-django52-djangorestframework315 + - python: '3.11' + TOXENV: py311-django52-djangorestframework315 + - python: '3.12' + TOXENV: py312-django52-djangorestframework315 + - python: '3.13' + TOXENV: py313-django52-djangorestframework315 steps: - uses: actions/checkout@v4 with: diff --git a/.gitignore b/.gitignore index 894d4cf4..c04ff5ad 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ dist/ build/ tests/static/ *local_settings.py -.coverage +.coverage* *~ ._* *.DS_Store diff --git a/CHANGES.rst b/CHANGES.rst index 68fc1f1d..6b2de388 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,8 @@ Changelog Version 1.2.0 [Unreleased] -------------------------- -Work in progress. +- Added Django ``5.2`` to automated testing build. +- Added Python ``3.13`` to automated testing build. Version 1.1.0 [2024-08-17] -------------------------- diff --git a/README.rst b/README.rst index fc6af5d2..5527f869 100644 --- a/README.rst +++ b/README.rst @@ -41,6 +41,7 @@ Compatibility with DRF, Django and Python ======================== ============================ ==================== ================================== DRF-gis version DRF version Django version Python version +**1.2.x** **3.12** up to **3.15** **4.2 to 5.2** **3.9** to **3.13** **1.1.x** **3.12** up to **3.15** **3.2, 4.2 to 5.1** **3.8** to **3.12** **1.0.x** **3.10** up to **3.13** **2.2 to 4.0** **3.6** to **3.9** **0.18.x** **3.10** up to **3.13** **2.2 to 4.0** **3.6** to **3.9** diff --git a/requirements-test.txt b/requirements-test.txt index 8e3fb1ea..3bd79fa3 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -2,4 +2,4 @@ psycopg2~=2.9.10 django-filter>=2.0 contexttimer # QA checks -openwisp-utils[qa] @ https://github.com/openwisp/openwisp-utils/tarball/1.2 +openwisp-utils[qa] @ git+https://github.com/openwisp/openwisp-utils@1.1.1 diff --git a/setup.py b/setup.py index 743705da..85b16d4c 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,11 @@ platforms=['Platform Indipendent'], keywords=['django', 'rest-framework', 'gis', 'geojson'], packages=find_packages(exclude=['tests', 'tests.*']), - install_requires=['djangorestframework>=3.12,<3.16', 'django-filter>=23.5,<26.0'], + install_requires=[ + 'django>=4.2', + 'djangorestframework>=3.12,<3.16', + 'django-filter>=23.5,<26.0', + ], classifiers=[ 'Development Status :: 4 - Beta', 'Environment :: Web Environment', @@ -40,6 +44,7 @@ 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', 'Programming Language :: Python :: 3 :: Only', ], project_urls={ diff --git a/tox.ini b/tox.ini index 390de64b..01c58713 100644 --- a/tox.ini +++ b/tox.ini @@ -2,8 +2,9 @@ envlist = py{39,310}-django{42,50}-djangorestframework{314}{,-pytest} py{311}-django{42}-djangorestframework{314}{,-pytest} - py{311,312}-django{50}-djangorestframework{315}{,-pytest} - py{311,312}-django{51}-djangorestframework{315}{,-pytest} + py{310,311,312,313}-django{50}-djangorestframework{315}{,-pytest} + py{310,311,312,313}-django{51}-djangorestframework{315}{,-pytest} + py{310,311,312,313}-django{52}-djangorestframework{315}{,-pytest} [testenv] usedevelop = true @@ -14,12 +15,13 @@ setenv = DRFG_TEST_RUNNER=./tests/manage.py test pytest: DRFG_TEST_RUNNER=-m pytest commands = - coverage run {env:DRFG_TEST_RUNNER} {posargs:tests/django_restframework_gis_tests} --parallel + coverage run {env:DRFG_TEST_RUNNER} {posargs:tests/django_restframework_gis_tests} deps = - django42: Django~=4.2.0 - django50: Django~=5.0.0 - django51: Django~=5.1.0 + django42: Django~=4.2a1 + django50: Django~=5.0a1 + django51: Django~=5.1a1 + django52: Django~=5.2a1 djangorestframework314: djangorestframework~=3.14.0 djangorestframework315: djangorestframework~=3.15.0 -rrequirements-test.txt