From 71ba047c29511b371ea2b4f2bd96bce5be07feeb Mon Sep 17 00:00:00 2001 From: ckarli <87313837+ckarli@users.noreply.github.com> Date: Tue, 5 Dec 2023 10:56:59 +0300 Subject: [PATCH 1/8] Update requirements.txt Django 5.0 Support --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 316ec4330..e3930bb15 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -Django>=3.2,<4.3 +Django>=3.2,<5.1 From 91a1697ded04f9ba48d113c1bdd66d6370f389e1 Mon Sep 17 00:00:00 2001 From: senbonsakura Date: Wed, 6 Dec 2023 11:17:46 +0300 Subject: [PATCH 2/8] Squashed commit of the following: commit 0918e15d61310d7d02b78e571e13aaab9557f0af Author: ckarli <87313837+ckarli@users.noreply.github.com> Date: Tue Dec 5 10:59:42 2023 +0300 Django 5.0 Update --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0e7e2b3c..7c2c9f780 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] - django-version: ['3.2', '4.1', '4.2'] + django-version: ['3.2', '4.1', '4.2','5.0'] exclude: - python-version: '3.11' django-version: '3.2' @@ -27,6 +27,8 @@ jobs: django-version: '4.1' - python-version: '3.7' django-version: '4.2' + - python-version: '3.7' + django-version: '5.0' services: redis: image: redis:6 From a8cfe70c21511a9788e6aff934b3edc5993554fe Mon Sep 17 00:00:00 2001 From: ckarli <87313837+ckarli@users.noreply.github.com> Date: Wed, 6 Dec 2023 15:49:23 +0300 Subject: [PATCH 3/8] Update ci.yml Deprecated Python 3.7 and added Python 3.12 --- .github/workflows/ci.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c2c9f780..6ee2cd406 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,19 +16,17 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.7', '3.8', '3.9', '3.10', '3.11'] - django-version: ['3.2', '4.1', '4.2','5.0'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + django-version: ['3.2', '4.1', '4.2', '5.0'] exclude: - python-version: '3.11' django-version: '3.2' + - python-version: '3.12' + django-version: '3.2' - python-version: '3.11' django-version: '4.1' - - python-version: '3.7' + - python-version: '3.12' django-version: '4.1' - - python-version: '3.7' - django-version: '4.2' - - python-version: '3.7' - django-version: '5.0' services: redis: image: redis:6 From 50298692cf0a9fd59edfd39b144e3b20ad07ddeb Mon Sep 17 00:00:00 2001 From: ckarli <87313837+ckarli@users.noreply.github.com> Date: Mon, 25 Dec 2023 15:01:58 +0300 Subject: [PATCH 4/8] Update tox.ini to support Py3.12 and Django 5.0 --- tox.ini | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index f76099c1e..170536c8f 100644 --- a/tox.ini +++ b/tox.ini @@ -2,8 +2,10 @@ envlist = py{37,38,39,310}-django3.2-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, py{38,39,310}-django4.1-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, - py{38,39,310,311}-django4.2-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, - py{310,311}-djangomain-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, + py{38,39,310,312}-django4.2-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, + py{310,311,312}-django5.0-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, + py{310,311,312}-djangomain-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased}, + [testenv] passenv = * @@ -13,10 +15,12 @@ basepython = py39: python3.9 py310: python3.10 py311: python3.11 + py312: python3.12 deps = django3.2: Django>=3.2,<4.0 django4.1: Django>=4.1,<4.2 django4.2: Django>=4.2,<4.3 + django5.0: Django>=5.9,<5.1 djangomain: https://github.com/django/django/archive/main.tar.gz psycopg2>=2.9.5,<3.0 psycopg @@ -49,10 +53,12 @@ python = 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [gh-actions:env] DJANGO = 3.2: django3.2 4.1: django4.1 4.2: django4.2 + 5.0: django5.0 main: djangomain From f66bc002cf5d75e8c3fcccedc91d0ae8e0c77d26 Mon Sep 17 00:00:00 2001 From: ckarli <87313837+ckarli@users.noreply.github.com> Date: Mon, 25 Dec 2023 15:02:33 +0300 Subject: [PATCH 5/8] Update quickstart.rst to support Py3.12 and Django 5.0 --- docs/quickstart.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/quickstart.rst b/docs/quickstart.rst index 220d8e046..848c3791d 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -4,8 +4,8 @@ Quick start Requirements ............ -- Django 3.2, 4.1, 4.2 -- Python 3.7-3.11 +- Django 3.2, 4.1, 4.2, 5.0 +- Python 3.7-3.12 - a cache configured as ``'default'`` with one of these backends: - `django-redis `_ From 51cb64e23bed51b7a49df6f1f2ea66df19908f17 Mon Sep 17 00:00:00 2001 From: ckarli <87313837+ckarli@users.noreply.github.com> Date: Mon, 25 Dec 2023 15:03:52 +0300 Subject: [PATCH 6/8] Update CHANGELOG.rst to support Py3.12 and Django 5.0 --- CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 607622068..29006fba6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,9 @@ What’s new in django-cachalot? ============================== +2.6.2 +----- + +- Support for Python 3.12 and Django 5.0 2.6.1 ----- From 442f71102bc7ea71cfcf8b6b735d5e68bfdb364b Mon Sep 17 00:00:00 2001 From: ckarli <87313837+ckarli@users.noreply.github.com> Date: Mon, 25 Dec 2023 15:04:43 +0300 Subject: [PATCH 7/8] Update setup.py to upport for Python 3.12 and Django 5.0 --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index a788af3eb..b6ac1bfa0 100755 --- a/setup.py +++ b/setup.py @@ -28,12 +28,14 @@ 'Framework :: Django :: 3.2', 'Framework :: Django :: 4.1', 'Framework :: Django :: 4.2', + 'Framework :: Django :: 5.0', 'Programming Language :: Python :: 3', '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', ], license='BSD', From c38d24a097b370871a314fc19c298b3481c7149b Mon Sep 17 00:00:00 2001 From: ckarli <87313837+ckarli@users.noreply.github.com> Date: Tue, 26 Dec 2023 14:48:03 +0300 Subject: [PATCH 8/8] Update tox.ini Co-authored-by: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com> --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 170536c8f..df8b570f8 100644 --- a/tox.ini +++ b/tox.ini @@ -20,7 +20,7 @@ deps = django3.2: Django>=3.2,<4.0 django4.1: Django>=4.1,<4.2 django4.2: Django>=4.2,<4.3 - django5.0: Django>=5.9,<5.1 + django5.0: Django>=5.0,<5.1 djangomain: https://github.com/django/django/archive/main.tar.gz psycopg2>=2.9.5,<3.0 psycopg