add support for Django 6.0 (#252)

Author: joshuadavidthomas

CHANGELOG.md

@@ -18,6 +18,10 @@ and this project attempts to adhere to [Semantic Versioning](https://semver.org/
 
 ## [Unreleased]
 
+### Added
+
+- Added support for Django 6.0.
+
 ### Changed
 
 - Bumped Rust toolchain from 1.88 to 1.90

CONTRIBUTING.md

@@ -40,10 +40,18 @@ $ # just --list --list-submodules
 
 Available recipes:
     bumpver *ARGS
+    check *ARGS
     clean
+    clippy *ARGS
+    fmt *ARGS
     lint          # run pre-commit on all files
     test *ARGS
     testall *ARGS
+    dev:
+        debug
+        explore FILENAME="djls.db"
+        inspect
+        record FILENAME="djls.db"
     docs:
         build LOCATION="site" # Build documentation
         serve PORT="8000"     # Serve documentation locally

Justfile

@@ -11,7 +11,7 @@ default:
 
 [private]
 cog:
-    uv run --no-project --with cogapp --with nox --no-project cog -r CONTRIBUTING.md README.md pyproject.toml
+    uv run --no-project --with cogapp --with nox cog -r CONTRIBUTING.md README.md pyproject.toml
 
 [private]
 nox SESSION *ARGS:

README.md

@@ -6,14 +6,17 @@ import cog
 
 from noxfile import DJ_VERSIONS
 from noxfile import PY_VERSIONS
+from noxfile import display_version
+
+django_versions = [display_version(version) for version in DJ_VERSIONS]
 
 cog.outl("[![PyPI](https://img.shields.io/pypi/v/django-language-server)](https://pypi.org/project/django-language-server/)")
 cog.outl("![PyPI - Python Version](https://img.shields.io/pypi/pyversions/django-language-server)")
-cog.outl(f"![Django Version](https://img.shields.io/badge/django-{'%20%7C%20'.join(DJ_VERSIONS)}-%2344B78B?labelColor=%23092E20)")
+cog.outl(f"![Django Version](https://img.shields.io/badge/django-{'%20%7C%20'.join(django_versions)}-%2344B78B?labelColor=%23092E20)")
 ]]] -->
 [![PyPI](https://img.shields.io/pypi/v/django-language-server)](https://pypi.org/project/django-language-server/)
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/django-language-server)
-![Django Version](https://img.shields.io/badge/django-4.2%20%7C%205.1%20%7C%205.2%20%7C%20main-%2344B78B?labelColor=%23092E20)
+![Django Version](https://img.shields.io/badge/django-4.2%20%7C%205.1%20%7C%205.2%20%7C%206.0%20%7C%20main-%2344B78B?labelColor=%23092E20)
 <!-- [[[end]]] -->
 
 A language server for the Django web framework.
@@ -51,12 +54,17 @@ import cog
 
 from noxfile import DJ_VERSIONS
 from noxfile import PY_VERSIONS
+from noxfile import display_version
+
+django_versions = [
+    display_version(version) for version in DJ_VERSIONS if version != "main"
+]
 
-cog.outl(f"- Python {', '.join([version for version in PY_VERSIONS])}")
-cog.outl(f"- Django {', '.join([version for version in DJ_VERSIONS if version != 'main'])}")
+cog.outl(f"- Python {', '.join(PY_VERSIONS)}")
+cog.outl(f"- Django {', '.join(django_versions)}")
 ]]] -->
 - Python 3.9, 3.10, 3.11, 3.12, 3.13
-- Django 4.2, 5.1, 5.2
+- Django 4.2, 5.1, 5.2, 6.0
 <!-- [[[end]]] -->
 
 See the [Versioning](#versioning) section for details on how this project's version indicates Django compatibility.

docs/index.md

@@ -16,14 +16,19 @@ import cog
 
 from noxfile import DJ_VERSIONS
 from noxfile import PY_VERSIONS
+from noxfile import display_version
+
+django_versions = [display_version(version) for version in DJ_VERSIONS]
 
 cog.outl("[![PyPI](https://img.shields.io/pypi/v/django-language-server)](https://pypi.org/project/django-language-server/)")
 cog.outl("![PyPI - Python Version](https://img.shields.io/pypi/pyversions/django-language-server)")
-cog.outl(f"![Django Version](https://img.shields.io/badge/django-{'%20%7C%20'.join(DJ_VERSIONS)}-%2344B78B?labelColor=%23092E20)")
+cog.outl(
+    f"![Django Version](https://img.shields.io/badge/django-{'%20%7C%20'.join(django_versions)}-%2344B78B?labelColor=%23092E20)"
+)
 ]]] -->
 [![PyPI](https://img.shields.io/pypi/v/django-language-server)](https://pypi.org/project/django-language-server/)
 ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/django-language-server)
-![Django Version](https://img.shields.io/badge/django-4.2%20%7C%205.1%20%7C%205.2%20%7C%20main-%2344B78B?labelColor=%23092E20)
+![Django Version](https://img.shields.io/badge/django-4.2%20%7C%205.1%20%7C%205.2%20%7C%206.0a0%20%7C%20main-%2344B78B?labelColor=%23092E20)
 <!-- [[[end]]] -->
 
 A language server for the Django web framework.
@@ -72,12 +77,17 @@ import cog
 
 from noxfile import DJ_VERSIONS
 from noxfile import PY_VERSIONS
+from noxfile import display_version
+
+django_versions = [
+    display_version(version) for version in DJ_VERSIONS if version != "main"
+]
 
-cog.outl(f"- Python {', '.join([version for version in PY_VERSIONS])}")
-cog.outl(f"- Django {', '.join([version for version in DJ_VERSIONS if version != 'main'])}")
+cog.outl(f"- Python {', '.join(PY_VERSIONS)}")
+cog.outl(f"- Django {', '.join(django_versions)}")
 ]]] -->
 - Python 3.9, 3.10, 3.11, 3.12, 3.13
-- Django 4.2, 5.1, 5.2
+- Django 4.2, 5.1, 5.2, 6.0a0
 <!-- [[[end]]] -->
 
 See the [Versioning](#versioning) section for details on how this project's version indicates Django compatibility.

noxfile.py

@@ -22,9 +22,10 @@
 DJ42 = "4.2"
 DJ51 = "5.1"
 DJ52 = "5.2"
+DJ60 = "6.0a1"
 DJMAIN = "main"
 DJMAIN_MIN_PY = PY312
-DJ_VERSIONS = [DJ42, DJ51, DJ52, DJMAIN]
+DJ_VERSIONS = [DJ42, DJ51, DJ52, DJ60, DJMAIN]
 DJ_LTS = [
     version for version in DJ_VERSIONS if version.endswith(".2") and version != DJMAIN
 ]
@@ -37,13 +38,22 @@ def version(ver: str) -> tuple[int, ...]:
     return tuple(map(int, ver.split(".")))
 
 
+def display_version(raw: str) -> str:
+    match = re.match(r"\d+(?:\.\d+)?", raw)
+    return match.group(0) if match else raw
+
+
 def should_skip(python: str, django: str) -> bool:
     """Return True if the test should be skipped"""
 
     if django == DJMAIN and version(python) < version(DJMAIN_MIN_PY):
         # Django main requires Python 3.10+
         return True
 
+    if django == DJ60 and version(python) < version(PY312):
+        # Django main requires Python 3.12+
+        return True
+
     if django == DJ52 and version(python) < version(PY310):
         # Django 5.2 requires Python 3.10+
         return True

pyproject.toml

@@ -32,15 +32,17 @@ classifiers = [
   # import cog
   #
   # from noxfile import DJ_VERSIONS
+  # from noxfile import display_version
   #
   # for version in DJ_VERSIONS:
   #     if version == "main":
   #         continue
-  #     cog.outl(f'  "Framework :: Django :: {version}",')
+  #     cog.outl(f'  "Framework :: Django :: {display_version(version)}",')
   # ]]] -->
   "Framework :: Django :: 4.2",
   "Framework :: Django :: 5.1",
   "Framework :: Django :: 5.2",
+  "Framework :: Django :: 6.0",
   # [[[end]]]
   "Intended Audience :: Developers",
   "License :: OSI Approved :: Apache Software License",