From 38999598ad137f56c409d22e4fd4737370514538 Mon Sep 17 00:00:00 2001
From: Phil Starkey <philipstarkey@users.noreply.github.com>
Date: Tue, 10 Mar 2026 20:11:36 +1100
Subject: [PATCH] Test against currently supported Python and Django versions

---
 .github/workflows/ci.yml | 24 +++++++++++-------------
 CHANGELOG.md             |  8 ++++++++
 setup.py                 |  9 ++++++---
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 339cfc6..4de98be 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,20 +20,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
-        django-version: [3.2, 4.1, 4.2, "5.0"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        django-version: ["4.2", "5.2", "6.0"]
         exclude:
           # excludes list
-          - python-version: 3.11
-            django-version: 3.2
-          - python-version: 3.12
-            django-version: 3.2
-          - python-version: 3.12
-            django-version: 4.1
-          - python-version: 3.8
-            django-version: 5.0
-          - python-version: 3.9
-            django-version: 5.0
+          - python-version: "3.13"
+            django-version: "4.2"
+          - python-version: "3.14"
+            django-version: "4.2"
+          - python-version: "3.10"
+            django-version: "6.0"
+          - python-version: "3.11"
+            django-version: "6.0"
 
     steps:
       - uses: actions/checkout@v4
@@ -48,7 +46,7 @@ jobs:
           pip install --upgrade coveralls ruff
           pip install "django~=${{ matrix.django-version }}"
       - name: Run ruff
-        run: ruff --output-format=github
+        run: ruff check --output-format=github
       - name: Run test
         run: coverage run --source=ipware manage.py test
       - name: Coveralls
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 271406e..7476a5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Unreleased
+
+Enhancement:
+- Added support for Django 5.2 and Django 6.0.
+- Added support for Python 3.13 and Python 3.14.
+- Dropped support for Django 3.2, Django 4.1, and Django 5.0.
+- Dropped support for Python 3.8 and Python 3.9
+
 # 7.0.0 / 7.0.1
 
 Enhance:
diff --git a/setup.py b/setup.py
index 3a6b0ab..6674ef6 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 from setuptools import setup
 
 package = 'ipware'
-python_requires = ">=3.8"
+python_requires = ">=3.10"
 here = os.path.abspath(os.path.dirname(__file__))
 
 requires = ['python-ipware>=2.0.3']
@@ -69,11 +69,14 @@ def status(s):
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        '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',
+        'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
+        'Framework :: Django :: 4.2',
+        'Framework :: Django :: 5.2',
+        'Framework :: Django :: 6.0',
     ],
     cmdclass={},
     tests_require=test_requirements,