Updates for latest Django supported versions

Author: dakrauth

.github/workflows/main.yml

@@ -9,20 +9,20 @@ on:
 jobs:
   tests:
     name: Python ${{ matrix.python-version }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
         python-version:
-        - 3.6
-        - 3.7
-        - 3.8
-        - 3.9
+        - 3.10
+        - 3.11
+        - 3.12
+        - 3.13
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 

.github/workflows/pre-commit.yml

@@ -8,14 +8,14 @@ on:
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
 
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v5
 
     - uses: pre-commit/[email protected]
       with:

docs/index.md

@@ -90,8 +90,8 @@ Writing the same code with `django-vanilla-views`, you'd instead arrive at a sim
 
 ## Requirements
 
-* **Django**: 2.2, 3.0, 3.1, 3.2
-* **Python**: 3.6, 3.7, 3.8, 3.9
+* **Django**: 4.2, 5.0, 5.1, 5.2
+* **Python**: 3.10, 3.11, 3.12, 3.13
 
 ## Installation
 

example/manage.py

@@ -1,10 +1,22 @@
 #!/usr/bin/env python
+"""Django's command-line utility for administrative tasks."""
 import os
 import sys
 
-if __name__ == "__main__":
+
+def main():
+    """Run administrative tasks."""
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings")
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
 
-    from django.core.management import execute_from_command_line
 
-    execute_from_command_line(sys.argv)
+if __name__ == "__main__":
+    main()

example/requirements.txt

@@ -1,2 +1,2 @@
-Django>=1.8
-django-vanilla-views==1.0.4
+Django>=4.2
+django-vanilla-views>=3.1.0

manage.py

@@ -1,10 +1,22 @@
 #!/usr/bin/env python
+"""Django's command-line utility for administrative tasks."""
 import os
 import sys
 
-if __name__ == "__main__":
+
+def main():
+    """Run administrative tasks."""
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testsettings")
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
 
-    from django.core.management import execute_from_command_line
 
-    execute_from_command_line(sys.argv)
+if __name__ == "__main__":
+    main()

pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools >= 40.6.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]
-target-version = ['py36']
+target-version = ['py310']
 
 [tool.isort]
 profile = "black"

setup.py

@@ -83,16 +83,16 @@ def get_package_data(package):
         "Changelog": "http://django-vanilla-views.org/topics/release-notes",
         "Repository": "https://github.com/tomchristie/django-vanilla-views/",
     },
-    python_requires=">=3.6",
+    python_requires=">=3.10",
     install_requires=[],
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Django",
-        "Framework :: Django :: 2.2",
-        "Framework :: Django :: 3.0",
-        "Framework :: Django :: 3.1",
-        "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4.2",
+        "Framework :: Django :: 5.0",
+        "Framework :: Django :: 5.1",
+        "Framework :: Django :: 5.2",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",

testsettings.py

@@ -9,18 +9,13 @@
 
 INSTALLED_APPS = ("vanilla",)
 
-if django.VERSION >= (1, 10):
-    MIDDLEWARE = [
-        "django.middleware.common.CommonMiddleware",
-        "django.middleware.csrf.CsrfViewMiddleware",
-    ]
-else:
-    MIDDLEWARE_CLASSES = [
-        "django.middleware.common.CommonMiddleware",
-        "django.middleware.csrf.CsrfViewMiddleware",
-    ]
+MIDDLEWARE = [
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+]
 
 SECRET_KEY = "abcde12345"
 
-if django.VERSION >= (3, 2):
-    DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
+USE_TZ = False

tox.ini

@@ -1,15 +1,13 @@
 [tox]
 isolated_build = True
 envlist =
-    py36-django{22,30,31,32}
-    py37-django{22,30,31,32}
-    py38-django{30,31,32}
-    py39-django{30,31,32}
+    py{310,311,312}-django{42,50,51,52}
+    py313-django{51,52}
 
 [testenv]
 commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning manage.py test
 deps =
-    django22: django>=2.2,<3.0
-    django30: django>=3.0,<3.1
-    django31: django>=3.1,<3.2
-    django32: django>=3.2,<4.0
+    django42: django>=4.2,<5.0
+    django50: django>=5.0,<5.1
+    django51: django>=5.1,<5.2
+    django52: django>=5.2b1,<6.0