chore: Add support for Django 6.x (#15)

CuriousLearner · web-flow · commit ce2cc7828aa3 · 2025-12-21T00:32:00.000-05:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -114,6 +114,50 @@ jobs:
           ! grep -r "{{" . --include="*.py" --include="*.md" --include="*.toml"
           ! grep -r "{%" . --include="*.py" --include="*.md" --include="*.toml"
 
+  test-version-matrix:
+    name: Test Python + Django Versions
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.12", "3.13", "3.14"]
+        django-version: ["5.2", "6.0"]
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install Copier
+        run: |
+          python -m pip install --upgrade pip
+          pip install copier
+
+      - name: Generate project with Python ${{ matrix.python-version }} + Django ${{ matrix.django-version }}
+        run: |
+          copier copy . ../test_versions \
+            --data project_name="Test Versions" \
+            --data project_slug="test_versions" \
+            --data project_description="Test Python ${{ matrix.python-version }} + Django ${{ matrix.django-version }}" \
+            --data author_name="Django Keel CI" \
+            --data author_email="ci@django-keel.test" \
+            --data python_version="${{ matrix.python-version }}" \
+            --data django_version="${{ matrix.django-version }}" \
+            --defaults \
+            --trust
+
+      - name: Verify Python version in pyproject.toml
+        run: |
+          cd ../test_versions
+          grep -q 'requires-python = ">=${{ matrix.python-version }}"' pyproject.toml
+
+      - name: Verify Django version in pyproject.toml
+        run: |
+          cd ../test_versions
+          grep -q 'django.*${{ matrix.django-version }}' pyproject.toml
+
   validate-yaml:
     name: Validate YAML Files
     runs-on: ubuntu-latest
@@ -192,7 +236,7 @@ jobs:
 
   all-checks:
     name: All Checks Passed
-    needs: [lint, test, test-generation, validate-yaml, security, docs]
+    needs: [lint, test, test-generation, test-version-matrix, validate-yaml, security, docs]
     runs-on: ubuntu-latest
     steps:
       - name: Confirm all checks passed
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
@@ -14,6 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.12", "3.13", "3.14"]
+        django-version: ["5.2", "6.0"]
         dependency-manager: [uv, poetry]
         database: [postgresql, sqlite-dev-postgres-prod]
 
@@ -37,6 +38,7 @@ jobs:
             --data author_name="CI Test" \
             --data author_email="ci@test.local" \
             --data python_version="${{ matrix.python-version }}" \
+            --data django_version="${{ matrix.django-version }}" \
             --data dependency_manager="${{ matrix.dependency-manager }}" \
             --data database="${{ matrix.database }}" \
             --defaults \
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 #### Core Features
 - Copier-based Django project template with flexible configuration options
-- Django 5.2 with Python 3.12/3.13/3.14 support
+- Django 5.2/6.0 with Python 3.12/3.13/3.14 support
 - Multiple package managers: uv, Poetry
 - Split settings structure: base, dev, test, prod
 - 12-Factor App compliance with environment-based configuration
@@ -69,6 +69,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 #### CI/CD
 - GitHub Actions workflow template
 - GitLab CI workflow template
+- Python + Django version matrix testing to verify all supported combinations
+
+#### Version Support
+- Django 5.2 and 6.0 support
+- Python 3.12, 3.13, and 3.14 support
 
 #### Documentation
 - ReadTheDocs integration with MkDocs Material theme
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Build **SaaS applications**, **API backends**, **web apps**, or **internal tools
 [![CI](https://github.com/CuriousLearner/django-keel/actions/workflows/ci.yml/badge.svg)](https://github.com/CuriousLearner/django-keel/actions/workflows/ci.yml)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Python 3.12+](https://img.shields.io/badge/python-3.12+-blue.svg)](https://www.python.org/downloads/)
-[![Django 5.2](https://img.shields.io/badge/django-5.2-green.svg)](https://www.djangoproject.com/)
+[![Django 6.0](https://img.shields.io/badge/django-6.0-green.svg)](https://www.djangoproject.com/)
 [![Documentation](https://readthedocs.org/projects/django-keel/badge/?version=latest)](https://django-keel.readthedocs.io/en/latest/?badge=latest)
 
 > [!NOTE]
@@ -310,17 +310,17 @@ We test Django Keel against:
 
 | Python | Django | Status    |
 | ------ | ------ | --------- |
-| 3.12   | 5.1    | ✅ Tested |
 | 3.12   | 5.2    | ✅ Tested |
-| 3.13   | 5.1    | ✅ Tested |
+| 3.12   | 6.0    | ✅ Tested |
 | 3.13   | 5.2    | ✅ Tested |
+| 3.13   | 6.0    | ✅ Tested |
 | 3.14   | 5.2    | ✅ Tested |
-| 3.14   | 5.2    | ✅ Tested |
+| 3.14   | 6.0    | ✅ Tested |
 
 ### Support Policy
 
 - **Python**: Last 2-3 minor versions (currently 3.12, 3.13, 3.14)
-- **Django**: Last 2-3 minor versions (currently 5.1, 5.2)
+- **Django**: Last 2-3 minor versions (currently 5.2, 6.0)
 - **LTS versions** get priority bug fixes
 - **Security patches** backported for 1 year
 
@@ -340,7 +340,7 @@ Every commit is tested against:
 
 ### 🎯 Core
 
-- **Django 5.2** with Python 3.12/3.13/3.14 support
+- **Django 5.2/6.0** with Python 3.12/3.13/3.14 support
 - **uv** or **Poetry** for blazing-fast dependency management
 - **[12-Factor App](https://12factor.net/) aligned** - Implements all 12 factors in practice ([docs](docs/12-factor.md))
   - Single codebase with multiple deploys
diff --git a/copier.yml b/copier.yml
@@ -64,6 +64,14 @@ python_version:
     - "3.12"
   default: "3.14"
 
+django_version:
+  type: str
+  help: Django version
+  choices:
+    - "5.2"
+    - "6.0"
+  default: "6.0"
+
 dependency_manager:
   type: str
   help: Package manager
diff --git a/docs/12-factor.md b/docs/12-factor.md
@@ -25,7 +25,7 @@ Django Keel strictly adheres to the [12-Factor App](https://12factor.net/) metho
 **Example:**
 ```toml
 dependencies = [
-    "django>=5.2,<5.3",
+    "django>=5.2,<7.0",
     "psycopg[binary]>=3.2.0",
     "gunicorn>=22.0.0",
 ]
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 #### Core Features
 - Copier-based Django project template with flexible configuration options
-- Django 5.2 with Python 3.12/3.13/3.14 support
+- Django 5.2/6.0 with Python 3.12/3.13/3.14 support
 - Multiple package managers: uv, Poetry
 - Split settings structure: base, dev, test, prod
 - 12-Factor App compliance with environment-based configuration
diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md
@@ -4,14 +4,14 @@
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Python 3.12+](https://img.shields.io/badge/python-3.12+-blue.svg)](https://www.python.org/downloads/)
-[![Django 5.2](https://img.shields.io/badge/django-5.2-green.svg)](https://www.djangoproject.com/)
+[![Django 6.0](https://img.shields.io/badge/django-6.0-green.svg)](https://www.djangoproject.com/)
 
 Django Keel is a comprehensive Copier template for Django projects that combines the best practices from over a decade of production Django development with modern tooling and deployment strategies.
 
 ## ✨ Features
 
 ### 🎯 Core
-- **Django 5.2** with Python 3.12/3.13/3.14 support
+- **Django 5.2/6.0** with Python 3.12/3.13/3.14 support
 - **uv** or **Poetry** for blazing-fast dependency management
 - **12-Factor App** configuration with django-environ
 - **Custom User Model** from day one
diff --git a/docs/index.md b/docs/index.md
@@ -4,7 +4,7 @@
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Python 3.12+](https://img.shields.io/badge/python-3.12+-blue.svg)](https://www.python.org/downloads/)
-[![Django 5.2](https://img.shields.io/badge/django-5.2-green.svg)](https://www.djangoproject.com/)
+[![Django 6.0](https://img.shields.io/badge/django-6.0-green.svg)](https://www.djangoproject.com/)
 [![Documentation Status](https://readthedocs.org/projects/django-keel/badge/?version=latest)](https://django-keel.readthedocs.io/en/latest/?badge=latest)
 
 Build **SaaS applications**, **API backends**, **web apps**, or **internal tools** with one comprehensive template.
@@ -112,7 +112,7 @@ Visit:
 
 ### 🎯 Core Foundation
 
-- **Django 5.2** with Python 3.12/3.13/3.14 support
+- **Django 5.2/6.0** with Python 3.12/3.13/3.14 support
 - **Custom User Model** from day one
 - **Split Settings** (base/dev/test/prod)
 - **12-Factor App** configuration with django-environ
diff --git a/pyproject.toml b/pyproject.toml
@@ -16,8 +16,8 @@ keywords = ["django", "template", "copier", "saas", "production"]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Framework :: Django",
-    "Framework :: Django :: 5.1",
     "Framework :: Django :: 5.2",
+    "Framework :: Django :: 6.0",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
diff --git a/template/CHANGELOG.md.jinja b/template/CHANGELOG.md.jinja
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Initial project setup generated with django-keel
-- Django {{ '5.2' }} with Python {{ python_version }}
+- Django {{ django_version }} with Python {{ python_version }}
 {% if api_style == 'drf' -%}
 - Django REST Framework API
 {% elif api_style == 'graphql-strawberry' -%}
diff --git a/template/README.md.jinja b/template/README.md.jinja
@@ -4,7 +4,7 @@
 
 ## Features
 
-- **Django {{ '5.2' }}** with Python {{ python_version }}
+- **Django {{ django_version }}** with Python {{ python_version }}
 - **Package Management**: {{ dependency_manager }}
 - **Database**: {{ database }}
 {% if cache == 'redis' -%}
diff --git a/template/docs/development/testing.md.jinja b/template/docs/development/testing.md.jinja
@@ -313,4 +313,4 @@ poetry run pytest -vv
 {% if api_style != 'none' -%}
 - [DRF testing](https://www.django-rest-framework.org/api-guide/testing/)
 {% endif -%}
-- [Django testing](https://docs.djangoproject.com/en/5.2/topics/testing/)
+- [Django testing](https://docs.djangoproject.com/en/{{ django_version }}/topics/testing/)
diff --git a/template/docs/index.md.jinja b/template/docs/index.md.jinja
@@ -9,7 +9,7 @@ Welcome to the {{ project_name }} documentation!
 ## Features
 
 ### Core
-- **Django 5.2** with Python {{ python_version }}
+- **Django {{ django_version }}** with Python {{ python_version }}
 - **Package Management**: {{ dependency_manager }}
 - **Database**: {{ database }} with connection pooling
 {% if cache == 'redis' -%}
diff --git a/template/{% if dependency_manager == 'poetry' %}pyproject.toml{% endif %}.jinja b/template/{% if dependency_manager == 'poetry' %}pyproject.toml{% endif %}.jinja
@@ -8,7 +8,7 @@ license = "{{ license }}"
 
 [tool.poetry.dependencies]
 python = "^{{ python_version }}"
-django = "^5.2"
+django = "^{{ django_version }}"
 django-environ = "^0.11.2"
 psycopg = {extras = ["binary"], version = "^3.2.0"}
 {% if cache == 'redis' -%}
diff --git a/template/{% if dependency_manager == 'uv' %}pyproject.toml{% endif %}.jinja b/template/{% if dependency_manager == 'uv' %}pyproject.toml{% endif %}.jinja
@@ -10,7 +10,7 @@ requires-python = ">={{ python_version }}"
 license = {text = "{{ license }}"}
 
 dependencies = [
-    "django>=5.2,<5.3",
+    "django>={{ django_version }}",
     "django-environ>=0.11.2",
     "psycopg[binary]>=3.2.0",
 {% if cache == 'redis' -%}

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ Django Keel strictly adheres to the [12-Factor App](https://12factor.net/) metho`
`25`	`25`	`Example:`
`26`	`26`	```toml
`27`	`27`	`dependencies = [`
`28`		`- "django>=5.2,<5.3",`
	`28`	`+ "django>=5.2,<7.0",`
`29`	`29`	`"psycopg[binary]>=3.2.0",`
`30`	`30`	`"gunicorn>=22.0.0",`
`31`	`31`	`]`