From 5d6bd1e4736612c7b600bd71373085ca09f693b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Dlouh=C3=BD?= <petr.dlouhy@email.cz>
Date: Fri, 7 Jun 2024 14:58:03 +0200
Subject: [PATCH] update testing matrix

---
 .github/workflows/main.yml |  6 +++++-
 tox.ini                    | 11 +++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4706322..98b1280 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,11 +23,12 @@ jobs:
     strategy:
       matrix:
         python-version:
-          # - "3.6"  stopped working with GitHub actions, disabling temporarily
           - "3.7"
           - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
       fail-fast: false
 
     services:
@@ -59,6 +60,9 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip wheel setuptools tox
+          python -m pip install setuptools
+          python -c "import setuptools; print(f'setuptools version: {setuptools.__version__}')"
+          python -c "import sys; print(f'Python version: {sys.version}')"
       - name: Run tox targets for ${{ matrix.python-version }}
         run: |
           ENV_PREFIX=$(tr -C -d "0-9" <<< "${{ matrix.python-version }}")
diff --git a/tox.ini b/tox.ini
index ade13f0..b4587d4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,8 +28,12 @@ show_missing = True
 [tox]
 envlist =
     checkqa,
-    py{36,37,38,39}-dj{22,30,31},
-    py{38,39,310}-dj{32,40,41,main}
+    py{37,38,39}-dj{22,30,31},
+    py{37,38,39,310}-dj{32}
+    py{38,39,310}-dj{32,40}
+    py{38,39,310,311}-dj{41}
+    py{38,39,310,311,312}-dj{42}
+    py{310,311,312}-dj{50,51,main}
 
 [testenv]
 passenv = CI, CIRCLECI, CIRCLE_*
@@ -41,6 +45,9 @@ deps =
     dj32: Django>=3.2,<4.0
     dj40: Django>=4.0,<4.1
     dj41: Django>=4.1,<4.2
+    dj42: Django>=4.2,<5.0
+    dj50: Django>=5.0,<5.1
+    dj51: Django>=5.1a1,<5.2
     master: https://github.com/django/django/tarball/master
     -r requirements_test.txt