Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[change] Update tested versions #332

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[change] Update tested versions #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dist/
build/
tests/static/
*local_settings.py
.coverage
.coverage*
*~
._*
*.DS_Store
Expand Down
3 changes: 2 additions & 1 deletion CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
--------------------------
Expand Down
1 change: 1 addition & 0 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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**
Expand Down
2 changes: 1 addition & 1 deletion requirements-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this change is made? We shouldn't pin the version in test dependencies

7 changes: 6 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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={
Expand Down
14 changes: 8 additions & 6 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this parallel flag is removed? Kindly follow the guidelines
https://openwisp.io/docs/dev/developer/contributing.html#avoiding-unnecessary-changes


deps =
django42: Django~=4.2.0
django50: Django~=5.0.0
django51: Django~=5.1.0
django42: Django~=4.2a1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm interested in the motivation to use alpha version of Django here

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ~ means “compatible with”. It still picks the latest version, just from alpha onwards rather than the GA release onwards.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I currently use ~= but usually starting with the first stable version (e.g. django~=4.2.0). I was curious about the motivation to include also alpha version (e.g. django~=4.2a1). What's the benefit?

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
Expand Down
Loading