From d53a5a7caa93a2db7474457d8701d999ff91c070 Mon Sep 17 00:00:00 2001 From: Matthias Kestenholz Date: Wed, 29 Nov 2023 08:34:57 +0100 Subject: [PATCH] Add Python 3.12, Django 5.0 --- .github/workflows/test.yml | 6 +++--- .pre-commit-config.yaml | 19 ++++++++----------- CHANGELOG.rst | 2 ++ pyproject.toml | 5 ++--- tox.ini | 10 ++++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fe67d40..fea7461 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: @@ -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: @@ -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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1c946de..da146f6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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 @@ -14,7 +14,7 @@ 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"] @@ -22,25 +22,22 @@ repos: 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 diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bde07c3..8723a8f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,8 @@ Change log Next version ~~~~~~~~~~~~ +- Added Python 3.12, Django 5.0. + 0.15 (2023-06-19) ~~~~~~~~~~~~~~~~~ diff --git a/pyproject.toml b/pyproject.toml index 72587f9..a367b68 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ license = {text = "BSD-3-Clause"} authors = [ { name = "Matthias Kestenholz", email = "mk@feinheit.ch" }, ] -requires-python = ">=3.6" +requires-python = ">=3.8" classifiers = [ "Environment :: Web Environment", "Framework :: Django", @@ -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", ] diff --git a/tox.ini b/tox.ini index 822e79e..4b6e84c 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -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 @@ -63,6 +64,7 @@ python = 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [gh-actions:env] DB_BACKEND =