Skip to content

Commit

Permalink
Add Python 3.12 to the test matrix.
Browse files Browse the repository at this point in the history
  • Loading branch information
tim-schilling committed Jul 22, 2023
1 parent 53747ef commit a9ec4bd
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
10 changes: 6 additions & 4 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.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']

services:
mariadb:
Expand Down Expand Up @@ -77,14 +77,16 @@ jobs:
fail-fast: false
max-parallel: 5
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
database: [postgresql, postgis]
# Add psycopg3 to our matrix for 3.10 and 3.11
# 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'
database: psycopg3

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

steps:
- uses: actions/checkout@v3
Expand Down
1 change: 1 addition & 0 deletions docs/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Pending
resolving to the wrong content type.
* Fixed SQL statement recording under PostgreSQL for queries encoded as byte
strings.
* Add tests for Python 3.12.

4.1.0 (2023-05-15)
------------------
Expand Down
11 changes: 6 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ envlist =
py{38,39,310}-dj32-{sqlite,postgresql,postgis,mysql}
py310-dj40-sqlite
py{310,311}-dj41-{sqlite,postgresql,postgis,mysql}
py{310,311}-dj{42,main}-{sqlite,postgresql,psycopg3,postgis,mysql}
py{310,311,312}-dj{42,main}-{sqlite,postgresql,psycopg3,postgis,mysql}

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

[testenv:py{38,39,310,311}-dj{32,40,41,42,main}-{postgresql,psycopg3}]
[testenv:py{38,39,310,311,312}-dj{32,40,41,42,main}-{postgresql,psycopg3}]
setenv =
{[testenv]setenv}
DB_BACKEND = postgresql
DB_PORT = {env:DB_PORT:5432}

[testenv:py{38,39,310,311}-dj{32,40,41,42,main}-postgis]
[testenv:py{38,39,310,311,312}-dj{32,40,41,42,main}-postgis]
setenv =
{[testenv]setenv}
DB_BACKEND = postgis
DB_PORT = {env:DB_PORT:5432}

[testenv:py{38,39,310,311}-dj{32,40,41,42,main}-mysql]
[testenv:py{38,39,310,311,312}-dj{32,40,41,42,main}-mysql]
setenv =
{[testenv]setenv}
DB_BACKEND = mysql
DB_PORT = {env:DB_PORT:3306}

[testenv:py{38,39,310,311}-dj{32,40,41,42,main}-sqlite]
[testenv:py{38,39,310,311,312}-dj{32,40,41,42,main}-sqlite]
setenv =
{[testenv]setenv}
DB_BACKEND = sqlite3
Expand Down Expand Up @@ -95,6 +95,7 @@ python =
3.9: py39
3.10: py310
3.11: py311
3.12: py312

[gh-actions:env]
DB_BACKEND =
Expand Down

0 comments on commit a9ec4bd

Please sign in to comment.