From 64883f9a2ebbcd5f576fa6e73b5f50704153f84a Mon Sep 17 00:00:00 2001 From: Tim Schilling Date: Fri, 22 Dec 2023 11:15:35 -0600 Subject: [PATCH] Add Django 5.0 Drop Django 4.1 Fixes #1283 --- .github/workflows/test.yml | 15 ++++++++++----- CHANGES.rst | 1 + README.rst | 2 +- docs/index.rst | 2 +- tox.ini | 5 +++-- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a07a846cd..97e546b42 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,20 +11,25 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12-dev'] - django-version: ['3.2', '4.1', '4.2', 'main'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + django-version: ['3.2', '4.2', '5.0', 'main'] exclude: + # Exclude py3.8 and py3.9 for Django main and 5.0 + - python-version: '3.8' + django-version: '5.0' + - python-version: '3.9' + django-version: '5.0' - python-version: '3.8' django-version: 'main' - - python-version: '3.9' django-version: 'main' + # Exclude py3.11 and py3.12 for Django 3.2 - python-version: '3.11' django-version: '3.2' - - python-version: '3.12-dev' + - python-version: '3.12' django-version: '3.2' services: @@ -115,7 +120,7 @@ jobs: # Install this project in editable mode, so that its package metadata can be queried pip install -e . # Install the latest minor version of Django we support - pip install Django==4.2 + pip install Django==5.0 - name: Check translation files are updated run: python -m simple_history.tests.generated_file_checks.check_translations diff --git a/CHANGES.rst b/CHANGES.rst index 0279c0dca..799e75173 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -15,6 +15,7 @@ Unreleased - Added temporary requirement on ``asgiref>=3.6`` while the minimum required Django version is lower than 4.2 (gh-1261) - Small performance optimization of the ``clean-duplicate_history`` command (gh-1015) +- Added support for Django 5.0 (gh-1283) 3.4.0 (2023-08-18) ------------------ diff --git a/README.rst b/README.rst index cff8ae901..fd2e270d0 100644 --- a/README.rst +++ b/README.rst @@ -42,8 +42,8 @@ This app supports the following combinations of Django and Python: Django Python ========== ======================== 3.2 3.8, 3.9, 3.10 -4.1 3.8, 3.9, 3.10, 3.11, 3.12-dev 4.2 3.8, 3.9, 3.10, 3.11, 3.12-dev +5.0 3.10, 3.11, 3.12-dev main 3.10, 3.11, 3.12-dev ========== ======================== diff --git a/docs/index.rst b/docs/index.rst index 75afa9a03..37c697ff3 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -42,8 +42,8 @@ This app supports the following combinations of Django and Python: Django Python ========== ======================= 3.2 3.8, 3.9, 3.10 -4.1 3.8, 3.9, 3.10, 3.11, 3.12-dev 4.2 3.8, 3.9, 3.10, 3.11, 3.12-dev +5.0 3.10, 3.11, 3.12-dev main 3.10, 3.11, 3.12-dev ========== ======================= diff --git a/tox.ini b/tox.ini index 87b3588a0..3611df84a 100644 --- a/tox.ini +++ b/tox.ini @@ -1,8 +1,8 @@ [tox] envlist = py{38,39,310}-dj32-{sqlite3,postgres,mysql,mariadb}, - py{38,39,310,311,312}-dj41-{sqlite3,postgres,mysql,mariadb}, py{38,39,310,311,312}-dj42-{sqlite3,postgres,mysql,mariadb}, + py{310,311,312}-dj50-{sqlite3,postgres,mysql,mariadb}, py{310,311,312}-djmain-{sqlite3,postgres,mysql,mariadb}, docs, lint @@ -18,8 +18,8 @@ python = [gh-actions:env] DJANGO = 3.2: dj32 - 4.1: dj41 4.2: dj42 + 5.0: dj50 main: djmain [flake8] @@ -34,6 +34,7 @@ deps = dj32: Django>=3.2,<3.3 dj41: Django>=4.1,<4.2 dj42: Django>=4.2,<4.3 + dj50: Django>=5.0,<5.1 djmain: https://github.com/django/django/tarball/main postgres: -rrequirements/postgres.txt mysql: -rrequirements/mysql.txt