Skip to content

Commit

Permalink
Add Python 3.12, Django 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiask committed Nov 29, 2023
1 parent b0a0200 commit d53a5a7
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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 @@ -69,7 +69,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:
postgres:
Expand Down Expand Up @@ -125,7 +125,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@v2
Expand Down
19 changes: 8 additions & 11 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
exclude: ".yarn/|yarn.lock|\\.min\\.(css|js)$"
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.5.0
hooks:
- id: check-added-large-files
- id: check-builtin-literals
Expand All @@ -14,33 +14,30 @@ repos:
- id: mixed-line-ending
- id: trailing-whitespace
- repo: https://github.com/adamchainz/django-upgrade
rev: 1.13.0
rev: 1.15.0
hooks:
- id: django-upgrade
args: [--target-version, "3.2"]
- repo: https://github.com/MarcoGorelli/absolufy-imports
rev: v0.3.1
hooks:
- id: absolufy-imports
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: "v0.0.270"
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.1.6"
hooks:
- id: ruff
- repo: https://github.com/psf/black
rev: 23.3.0
hooks:
- id: black
- id: ruff-format
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.0-alpha.9-for-vscode
rev: v3.1.0
hooks:
- id: prettier
args: [--list-different, --no-semi]
exclude: "^conf/|.*\\.html$"
- repo: https://github.com/tox-dev/pyproject-fmt
rev: 0.11.2
rev: 1.5.1
hooks:
- id: pyproject-fmt
- repo: https://github.com/abravalheri/validate-pyproject
rev: v0.13
rev: v0.15
hooks:
- id: validate-pyproject
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Change log
Next version
~~~~~~~~~~~~

- Added Python 3.12, Django 5.0.


0.15 (2023-06-19)
~~~~~~~~~~~~~~~~~
Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ license = {text = "BSD-3-Clause"}
authors = [
{ name = "Matthias Kestenholz", email = "[email protected]" },
]
requires-python = ">=3.6"
requires-python = ">=3.8"
classifiers = [
"Environment :: Web Environment",
"Framework :: Django",
Expand All @@ -21,12 +21,11 @@ classifiers = [
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
"Topic :: Software Development",
]
Expand Down
10 changes: 6 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
envlist =
docs
py{38,39,310}-dj{32,41,42}-{sqlite,postgresql,mysql}
py{310,311}-dj{32,41,42,main}-{sqlite,postgresql,mysql}
py{310,311,312}-dj{32,41,42,50,main}-{sqlite,postgresql,mysql}

[testenv]
deps =
dj32: Django>=3.2,<4.0
dj41: Django>=4.1,<4.2
dj42: Django>=4.2,<5.0
dj50: Django>=5.0,<5.1
djmain: https://github.com/django/django/archive/main.tar.gz
postgresql: psycopg2-binary
mysql: mysqlclient
Expand All @@ -33,19 +34,19 @@ pip_pre = True
commands =
python tests/manage.py test -v 2 {posargs:testapp}

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

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

[testenv:py{38,39,310}-dj{32,41,42,main}-sqlite]
[testenv:py{38,39,310,311,312}-dj{32,41,42,50,main}-sqlite]
setenv =
{[testenv]setenv}
DB_BACKEND = sqlite3
Expand All @@ -63,6 +64,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 d53a5a7

Please sign in to comment.