diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f526fcfc..3a6506cf 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: fail-fast: false matrix: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] - django-version: ['3.2', '4.1', 'main'] + django-version: ['3.2', '4.1', '4.2', 'main'] postgres-version: ['11', '12'] mariadb-version: ['10.3', '10.4'] exclude: @@ -20,9 +20,11 @@ jobs: - python-version: '3.12' django-version: '3.2' - # Django <=4.1 doesn't support python 3.12 (https://docs.djangoproject.com/en/4.1/faq/install/) + # Django <=4.2.7 doesn't support python 3.12 (https://docs.djangoproject.com/en/4.1/faq/install/) - python-version: '3.12' django-version: '4.1' + - python-version: '3.12' # TODO remove this once Django 4.2.8 is released + django-version: '4.2' # only test Django dev with PostgreSQL 12 and MariaDB 10.4 - django-version: '3.2' @@ -35,6 +37,11 @@ jobs: - django-version: '4.1' mariadb-version: '10.4' + - django-version: '4.2' + postgres-version: '11' + - django-version: '4.2' + mariadb-version: '10.3' + - django-version: 'main' postgres-version: '11' - django-version: 'main' diff --git a/README.md b/README.md index 3728ff84..db7e8132 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Silk is a live profiling and inspection tool for the Django framework. Silk inte Silk has been tested with: -* Django: 3.2, 4.1 +* Django: 3.2, 4.1, 4.2 * Python: 3.8, 3.9, 3.10, 3.11, 3.12 ## Installation diff --git a/docs/index.rst b/docs/index.rst index 2f492243..2e11e6c5 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -57,5 +57,5 @@ Features Requirements ------------ -* Django: 3.2, 4.1 +* Django: 3.2, 4.1, 4.2 * Python: 3.8, 3.9, 3.10 diff --git a/setup.py b/setup.py index 1bc90a5b..90b872bf 100644 --- a/setup.py +++ b/setup.py @@ -23,6 +23,7 @@ 'Framework :: Django', 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.1', + 'Framework :: Django :: 4.2', 'Intended Audience :: Developers', 'Operating System :: OS Independent', 'Programming Language :: Python', diff --git a/tox.ini b/tox.ini index c7834f2d..fee486b5 100644 --- a/tox.ini +++ b/tox.ini @@ -10,14 +10,15 @@ python = DJANGO = 3.2: dj32 4.1: dj41 + 4.2: dj42 main: djmain [tox] envlist = py{38,39,310}-dj32-{sqlite3,mysql,postgresql} - py{38,39,310}-dj{40,41,main}-{sqlite3,mysql,postgresql} - py311-dj{41,main}-{sqlite3,mysql,postgresql} - py312-dj{main}-{sqlite3,mysql,postgresql} + py{38,39,310}-dj{40,41,42,main}-{sqlite3,mysql,postgresql} + py311-dj{41,42,main}-{sqlite3,mysql,postgresql} + py312-dj{42,main}-{sqlite3,mysql,postgresql} [testenv] usedevelop = True @@ -30,6 +31,7 @@ deps = postgresql: psycopg2-binary dj32: django>=3.2,<3.3 dj41: django>=4.1,<4.2 + dj42: django>=4.2,<4.3 djmain: https://github.com/django/django/archive/main.tar.gz py312: setuptools setenv =