From 58a45285821588c63a17e7f6fc13676b250c6d15 Mon Sep 17 00:00:00 2001 From: Jelmer Draaijer Date: Thu, 26 Oct 2023 13:06:31 +0200 Subject: [PATCH 1/2] Add Python 3.12 to test matrix and add classifier --- .github/workflows/ci.yml | 2 ++ changelog.d/689.misc | 1 + setup.cfg | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 changelog.d/689.misc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f42b4ef9..d9c93001 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,7 @@ jobs: python-version: - '3.10' - '3.11' + - '3.12' django-version: - '4.2' - '5.0' @@ -36,6 +37,7 @@ jobs: redis-version: 'latest' python-version: '3.9' + # latest Django with pre-release redis - django-version: '5.1' redis-version: 'master' diff --git a/changelog.d/689.misc b/changelog.d/689.misc new file mode 100644 index 00000000..4087d685 --- /dev/null +++ b/changelog.d/689.misc @@ -0,0 +1 @@ +Added support for Python 3.12 \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 08781667..9ba9535e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -25,6 +25,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development :: Libraries Topic :: Utilities @@ -57,7 +58,8 @@ envlist = ruff mypy # tests against released versions - py{38,39,310,311}-dj{42,50,51}-redislatest + py{38,39}-dj{42}-redislatest + py{310,311,312}-dj{42,50,51}-redislatest # tests against unreleased versions py311-dj51-redismaster py311-djmain-redis{latest,master} @@ -68,6 +70,7 @@ python = 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [gh-actions:env] DJANGO = From 6321750839dceeb15ceb96e50a793a0c2ca5dc6e Mon Sep 17 00:00:00 2001 From: Jelmer Draaijer Date: Wed, 1 Nov 2023 10:02:09 +0100 Subject: [PATCH 2/2] Install setuptools manually for Python 3.12 compatibility --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9c93001..3d595ca8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,21 +37,20 @@ jobs: redis-version: 'latest' python-version: '3.9' - # latest Django with pre-release redis - django-version: '5.1' redis-version: 'master' - python-version: '3.11' + python-version: '3.12' # latest redis with pre-release Django - django-version: 'main' redis-version: 'latest' - python-version: '3.11' + python-version: '3.12' # pre-release Django and redis - django-version: 'main' redis-version: 'master' - python-version: '3.11' + python-version: '3.12' steps: - uses: actions/checkout@v4