From e55514561b2c3159b43b00a4d1f40f033de3b657 Mon Sep 17 00:00:00 2001
From: Jan Pieter Waagmeester <jieter@waarneming.nl>
Date: Tue, 5 Dec 2023 09:08:37 +0100
Subject: [PATCH] Add django 5.0 and python 3.12 to the build matrix (#105)

---
 .github/workflows/ci.yml | 28 ++++++++++++++++++++--------
 setup.py                 |  6 +++---
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index edd0860..033008c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,19 +39,31 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", 3.11]
-        django-version: [3.2, 4.0, 4.1, 4.2]
+        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.7
-              django-version: 4.0
-            - python-version: 3.7
-              django-version: 4.1
-            - python-version: 3.7
-              django-version: 4.2
+            # Django 3.2
             - python-version: "3.10"
               django-version: 3.2
             - python-version: 3.11
               django-version: 3.2
+            - python-version: 3.12
+              django-version: 3.2
+
+            # Django 4.1
+            - python-version: 3.12
+              django-version: 4.1
+
+            # Django 4.2
+            - python-version: 3.12
+              django-version: 4.2
+
+            # Django 5.0
+            - python-version: 3.8
+              django-version: 5.0
+            - python-version: 3.9
+              django-version: 5.0
+
 
     steps:
       - name: Set up Python ${{ matrix.python-version }}
diff --git a/setup.py b/setup.py
index 082e983..20eba13 100755
--- a/setup.py
+++ b/setup.py
@@ -38,22 +38,22 @@
     classifiers=[
         "Environment :: Web Environment",
         "Framework :: Django",
-        "Framework :: Django :: 3.2",
+        "Framework :: Django :: 3.2",  # Until April 2024
         "Framework :: Django :: 4.0",
         "Framework :: Django :: 4.1",
         "Framework :: Django :: 4.2",
+        "Framework :: Django :: 5.0",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.6",
-        "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",
         "Topic :: Software Development :: Libraries",
     ],