diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2725c881..413627b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: services: postgres: - image: postgis/postgis:10-2.5 + image: postgis/postgis:13-3.3 env: POSTGRES_PASSWORD: postgres POSTGRES_USER: postgres @@ -71,6 +71,39 @@ jobs: TOXENV: py38-django40-djangorestframework313 - python: 3.9 TOXENV: py39-django40-djangorestframework313 + - python: 3.8 + TOXENV: py38-django41-djangorestframework313 + - python: 3.9 + TOXENV: py39-django41-djangorestframework313 + - python: 3.10 + TOXENV: py39-django41-djangorestframework313 + - python: 3.11 + TOXENV: py39-django41-djangorestframework313 + - python: 3.8 + TOXENV: py38-django42-djangorestframework313 + - python: 3.9 + TOXENV: py39-django42-djangorestframework313 + - python: 3.10 + TOXENV: py310-django42-djangorestframework313 + - python: 3.11 + TOXENV: py311-django42-djangorestframework313 + - python: 3.8 + TOXENV: py38-django41-djangorestframework314 + - python: 3.9 + TOXENV: py39-django41-djangorestframework314 + - python: 3.10 + TOXENV: py39-django41-djangorestframework314 + - python: 3.11 + TOXENV: py39-django41-djangorestframework314 + - python: 3.8 + TOXENV: py38-django42-djangorestframework314 + - python: 3.9 + TOXENV: py39-django42-djangorestframework314 + - python: 3.10 + TOXENV: py310-django42-djangorestframework314 + - python: 3.11 + TOXENV: py311-django42-djangorestframework314 + steps: - uses: actions/checkout@v2 with: diff --git a/README.rst b/README.rst index 66b45310..311d8372 100644 --- a/README.rst +++ b/README.rst @@ -39,6 +39,7 @@ Compatibility with DRF, Django and Python ======================== ============================ ==================== ================================== DRF-gis version DRF version Django version Python version +**1.1.x** **3.13** up to **3.14** **2.2 to 4.2** **3.8** to **3.11** **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** **0.17.x** **3.10** up to **3.12** **2.2 to 3.1** **3.6** to **3.8** diff --git a/docker-compose.yml b/docker-compose.yml index 98542c31..28f3663c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,7 @@ services: command: sh -c "pip install -e . && python ./tests/manage.py test tests/django_restframework_gis_tests && ./run-qa-checks" postgres: - image: mdillon/postgis:10-alpine + image: postgis/postgis:13-3.3 environment: POSTGRES_PASSWORD: postgres POSTGRES_USER: postgres diff --git a/requirements-test.txt b/requirements-test.txt index 3c0aff2d..00ee6b4a 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,4 +1,4 @@ -psycopg2~=2.8.0 +psycopg2 django-filter>=2.0 contexttimer # QA checks diff --git a/tox.ini b/tox.ini index 63f36f82..212e0e5b 100644 --- a/tox.ini +++ b/tox.ini @@ -3,6 +3,8 @@ envlist = py{37,38,39,py3}-django{22}-djangorestframework{310,312}{,-pytest} py{37,38,39,py3}-django{30,31,32}-djangorestframework{312}{,-pytest} py{38,39,py3}-django{40}-djangorestframework{313}{,-pytest} + py{38,39,10,11,py3}-django{41}-djangorestframework{313,314}{,-pytest} + py{38,39,10,11,py3}-django{42}-djangorestframework{313,314}{,-pytest} [testenv] usedevelop = true @@ -22,9 +24,12 @@ deps = django31: Django~=3.1.0 django32: Django~=3.2.0 django40: Django~=4.0.0 + django41: Django~=4.1.0 + django42: Django~=4.2.0 djangorestframework310: djangorestframework~=3.10.0 djangorestframework312: djangorestframework~=3.12.0 djangorestframework313: djangorestframework~=3.13.0 + djangorestframework314: djangorestframework~=3.14.0 -rrequirements-test.txt pytest: pytest pytest: pytest-django