From aeae78dce1763b772b3fe7f5b4acb8aed5e9c267 Mon Sep 17 00:00:00 2001
From: Leonardo Cavallucci <leo.cavallucci@gmail.com>
Date: Thu, 30 Nov 2023 10:08:51 +0100
Subject: [PATCH] Update test matrix to include Django 5 (#662)

---
 .github/workflows/test.yml         | 19 +++++++++++++++++--
 tests/requirements/dj42_cms311.txt |  4 ++++
 tests/requirements/dj42_cms41.txt  |  4 ++++
 tests/requirements/dj50_cms41.txt  |  4 ++++
 tox.ini                            |  5 +++++
 5 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 tests/requirements/dj42_cms311.txt
 create mode 100644 tests/requirements/dj42_cms41.txt
 create mode 100644 tests/requirements/dj50_cms41.txt

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bb93c288d..45d3d7bb3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ 3.7, 3.8, 3.9, '3.10', "3.11"]
+        python-version: [ 3.7, 3.8, 3.9, "3.10", "3.11"]
         requirements-file: [
           dj22_cms37.txt,
           dj22_cms38.txt,
@@ -19,7 +19,12 @@ jobs:
           dj32_cms311.txt,
           dj32_cms41.txt,
           dj40_cms311.txt,
-          dj40_cms41.txt
+          dj40_cms41.txt,
+          dj41_cms311.txt,
+          dj41_cms41.txt,
+          dj42_cms311.txt,
+          dj42_cms41.txt,
+          dj50_cms41.txt
         ]
         os: [
           ubuntu-20.04,
@@ -35,6 +40,16 @@ jobs:
             requirements-file: dj41_cms311.txt
           - python-version: 3.7
             requirements-file: dj41_cms41.txt
+          - python-version: 3.7
+            requirements-file: dj42_cms311.txt
+          - python-version: 3.7
+            requirements-file: dj42_cms41.txt
+          - python-version: 3.7
+            requirements-file: dj50_cms41.txt
+          - python-version: 3.8
+            requirements-file: dj50_cms41.txt
+          - python-version: 3.9
+            requirements-file: dj50_cms41.txt
           - python-version: "3.10"
             requirements-file: dj22_cms40.txt
           - python-version: "3.11"
diff --git a/tests/requirements/dj42_cms311.txt b/tests/requirements/dj42_cms311.txt
new file mode 100644
index 000000000..8e9146451
--- /dev/null
+++ b/tests/requirements/dj42_cms311.txt
@@ -0,0 +1,4 @@
+-r base.txt
+
+Django>=4.2,<5.0
+django-cms>=3.11,<3.12
\ No newline at end of file
diff --git a/tests/requirements/dj42_cms41.txt b/tests/requirements/dj42_cms41.txt
new file mode 100644
index 000000000..9ba7dec2e
--- /dev/null
+++ b/tests/requirements/dj42_cms41.txt
@@ -0,0 +1,4 @@
+-r base.txt
+
+Django>=4.2,<5.0
+git+https://github.com/django-cms/django-cms@develop-4#egg=django-cms
\ No newline at end of file
diff --git a/tests/requirements/dj50_cms41.txt b/tests/requirements/dj50_cms41.txt
new file mode 100644
index 000000000..562a7ef4a
--- /dev/null
+++ b/tests/requirements/dj50_cms41.txt
@@ -0,0 +1,4 @@
+-r base.txt
+
+Django~=5.0rc1,<5.1
+git+https://github.com/django-cms/django-cms@develop-4#egg=django-cms
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index bf480cd51..5586d908c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,9 @@ envlist =
     py{37,38,39}-dj{31}-cms{38,39}
     py{38,39,310}-dj{32}-cms{39,310,311,41}
     py{38,39,310}-dj{40}-cms{311,41}
+    py{38,39,310}-dj{41}-cms{311,41}
+    py{38,39,310}-dj{42}-cms{311,41}
+    py{310}-dj{50}-cms{41}
 
 skip_missing_interpreters=True
 
@@ -18,6 +21,8 @@ deps =
     dj32: Django>=3.2,<3.3
     dj40: Django>=4.0,<4,1
     dj41: Django>=4.1,<4.2
+    dj42: Django>=4.2,<5.0
+    dj50: Django~=5.0rc1,<5.1
     cms37: django-cms>=3.7,<3.8
     cms38: django-cms>=3.8,<3.9
     cms39: django-cms>=3.9,<3.10