Skip to content

Commit

Permalink
Support Django 4.2 (#685)
Browse files Browse the repository at this point in the history
  • Loading branch information
albertyw authored Dec 2, 2023
1 parent 64c02f8 commit 81c81a9
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
11 changes: 9 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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'
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
8 changes: 5 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 =
Expand Down

0 comments on commit 81c81a9

Please sign in to comment.