Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
34 changes: 21 additions & 13 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
max-parallel: 5
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']

services:
mariadb:
Expand Down Expand Up @@ -73,25 +73,33 @@ jobs:
fail-fast: false
max-parallel: 5
matrix:
# Skip 3.13 here, it needs the psycopg3 / postgis3 database
python-version: ['3.9', '3.10', '3.11', '3.12']
database: [postgresql, postgis]
# Add psycopg3 to our matrix for modern python versions
include:
- python-version: '3.10'
database: psycopg3
- python-version: '3.11'
database: psycopg3
- python-version: '3.12'
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
database: [postgresql, postgis, psycopg3]
exclude:
- python-version: '3.9'
database: psycopg3
- python-version: '3.13'
database: psycopg3
database: postgis
- python-version: '3.13'
database: postgresql
- python-version: '3.14'
database: postgis
- python-version: '3.14'
database: postgresql
# Add postgis3 to our matrix for modern Python versions
include:
- python-version: '3.13'
database: postgis3
- python-version: '3.13'
database: psycopg3
env:
DJANGO_SELENIUM_TESTS=true
- python-version: '3.14'
database: postgis3
- python-version: '3.14'
database: psycopg3
env:
DJANGO_SELENIUM_TESTS=true

services:
postgres:
Expand Down Expand Up @@ -155,7 +163,7 @@ jobs:
fail-fast: false
max-parallel: 5
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']

steps:
- uses: actions/checkout@v5
Expand Down
10 changes: 6 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ envlist =
py{39,310,311,312}-dj{42}-{sqlite,postgresql,postgis,mysql}
py{310,311,312}-dj{42,50,51,52}-{sqlite,postgresql,psycopg3,postgis,mysql}
py{313}-dj{51,52,main}-{sqlite,psycopg3,postgis3,mysql}
py{314}-dj{52,main}-{sqlite,psycopg3,postgis3,mysql}

[testenv]
deps =
Expand Down Expand Up @@ -52,28 +53,28 @@ pip_pre = True
commands = python -b -W always -m coverage run -m django test -v2 {posargs:tests}


[testenv:py{39,310,311,312,313}-dj{42,50,51,52,main}-{postgresql,psycopg3}]
[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,main}-{postgresql,psycopg3}]
setenv =
{[testenv]setenv}
DB_BACKEND = postgresql
DB_PORT = {env:DB_PORT:5432}


[testenv:py{39,310,311,312,313}-dj{42,50,51,52,main}-{postgis,postgis3}]
[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,main}-{postgis,postgis3}]
setenv =
{[testenv]setenv}
DB_BACKEND = postgis
DB_PORT = {env:DB_PORT:5432}


[testenv:py{39,310,311,312,313}-dj{42,50,51,52,main}-mysql]
[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,main}-mysql]
setenv =
{[testenv]setenv}
DB_BACKEND = mysql
DB_PORT = {env:DB_PORT:3306}


[testenv:py{39,310,311,312,313}-dj{42,50,51,52,main}-sqlite]
[testenv:py{39,310,311,312,313,314}-dj{42,50,51,52,main}-sqlite]
setenv =
{[testenv]setenv}
DB_BACKEND = sqlite3
Expand Down Expand Up @@ -103,6 +104,7 @@ python =
3.11: py311
3.12: py312
3.13: py313
3.14: py314

[gh-actions:env]
DB_BACKEND =
Expand Down