Merge pull request #216 from django-commons/click82

Click82

Author: bckohan

.github/workflows/test.yml

@@ -33,7 +33,7 @@ jobs:
       actions: write
     strategy:
       matrix:
-        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14.0-beta.2']
         django-version:
           - '3.2' # LTS April 2024
           - '4.2' # LTS April 2026
@@ -57,6 +57,14 @@ jobs:
             django-version: '5.0'
           - python-version: '3.9'
             django-version: '5.2'
+          - python-version: '3.14.0-beta.2'
+            django-version: '3.2'
+          - python-version: '3.14.0-beta.2'
+            django-version: '4.2'
+          - python-version: '3.14.0-beta.2'
+            django-version: '5.0'
+          - python-version: '3.14.0-beta.2'
+            django-version: '5.1'
     env:
       COVERAGE_FILE: py${{ matrix.python-version }}-linux-dj${{ matrix.django-version }}.coverage
       TEST_PYTHON_VERSION: ${{ matrix.python-version }}

doc/source/changelog.rst

@@ -4,13 +4,17 @@
 Change Log
 ==========
 
+v3.2.0 (2025-04-30)
+===================
+
+* Implemented `Support click 8.2 <https://github.com/django-commons/django-typer/issues/215>`_
 
-v3.1.1 (2024-04-30)
+v3.1.1 (2025-04-30)
 ===================
 
 * Implemented `Support rich 14 <https://github.com/django-commons/django-typer/issues/213>`_
 
-v3.1.0 (2024-04-02)
+v3.1.0 (2025-04-02)
 ===================
 
 * Fixed `Fish shell completion fails for any script named something other than "manage" <https://github.com/django-commons/django-typer/issues/207>`_
@@ -29,7 +33,7 @@ v3.1.0 (2024-04-02)
 * Implemented `Require tests to pass before release action runs. <https://github.com/django-commons/django-typer/issues/173>`_
 
 
-v3.0.0 (2024-02-16)
+v3.0.0 (2025-02-16)
 ===================
 
 * Implemented `Completer for media files. <https://github.com/django-commons/django-typer/issues/175>`_

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "django-typer"
-version = "3.1.1"
+version = "3.2.0"
 requires-python = ">=3.9,<4.0"
 description = "Use Typer to define the CLI for your Django management commands."
 authors = [
@@ -18,11 +18,11 @@ homepage = "https://django-typer.readthedocs.io"
 keywords = ["django", "CLI", "management", "Typer", "commands"]
 dependencies = [
     "Django>=3.2,<6.0",
-    "click>=8.1.8,<8.2",
+    "click>=8.1.8,<8.3",
     # typer's release history is full of breaking changes for minor versions
     # given the reliance on some of its private internals we peg the typer
     # version very strictly to bug fix releases for specific minor lines.
-    "typer-slim>=0.14.0,<0.16.0",
+    "typer-slim>=0.14.0,<0.17.0",
     "shellingham>=1.5.4,<2.0",
     # we need this on 3.9 for ParamSpec
     "typing-extensions>=3.7.4.3; python_version < '3.10'",
@@ -49,6 +49,7 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Internet :: WWW/HTTP :: Site Management",
     "Topic :: Software Development :: Libraries",

src/django_typer/__init__.py

@@ -33,7 +33,7 @@
 and keep a tight version lock on Typer.
 """
 
-VERSION = (3, 1, 1)
+VERSION = (3, 2, 0)
 
 __title__ = "Django Typer"
 __version__ = ".".join(str(i) for i in VERSION)

src/django_typer/management/commands/shellcompletion.py

@@ -31,8 +31,10 @@
 
 from click import get_current_context
 from click.core import ParameterSource
-from click.parser import split_arg_string
-from click.shell_completion import CompletionItem
+from click.shell_completion import (
+    CompletionItem,
+    split_arg_string,  # pyright: ignore[reportPrivateImportUsage]
+)
 from django.core.management import CommandError, ManagementUtility
 from django.utils.module_loading import import_string
 from django.utils.translation import gettext_lazy as _

tests/verify_environment.py

@@ -1,6 +1,7 @@
 import os
 import sys
-import django
+from django import VERSION
+from packaging.version import parse as parse_version
 
 
 def test():
@@ -10,17 +11,14 @@ def test():
     expected_python = os.environ["TEST_PYTHON_VERSION"]
     expected_django = os.environ["TEST_DJANGO_VERSION"]
 
-    expected_python = tuple(int(v) for v in expected_python.split(".") if v)
-    assert sys.version_info[: len(expected_python)] == expected_python, (
-        f"Python Version Mismatch: {sys.version_info[: len(expected_python)]} != "
-        f"{expected_python}"
+    expected_python = parse_version(expected_python)
+    assert sys.version_info[:2] == (expected_python.major, expected_python.minor), (
+        f"Python Version Mismatch: {sys.version_info[:2]} != {expected_python}"
     )
 
-    try:
-        expected_django = tuple(int(v) for v in expected_django.split(".") if v)
-        assert django.VERSION[: len(expected_django)] == expected_django, (
-            f"Django Version Mismatch: {django.VERSION[: len(expected_django)]} != "
-            f"{expected_django}"
-        )
-    except ValueError:
-        assert expected_django == django.__version__
+    dj_actual = VERSION[:2]
+    expected_django = parse_version(expected_django)
+    dj_expected = (expected_django.major, expected_django.minor)
+    assert dj_actual == dj_expected, (
+        f"Django Version Mismatch: {dj_actual} != {expected_django}"
+    )