django-codemod 2.3.7__tar.gz → 2.4.0__tar.gz

{django_codemod-2.3.7/src/django_codemod.egg-info → django_codemod-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-codemod
-Version: 2.3.7
+Version: 2.4.0
 Summary: A command line tool to automatically fix Django deprecations.
 Author-email: Bruno Alla <alla.brunoo@gmail.com>
 License-Expression: MIT
@@ -16,16 +16,16 @@ Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: click<8.2
+Requires-Dist: click<8.3
 Requires-Dist: libcst==1.8.4
 Requires-Dist: pathspec<1,>=0.6
 Requires-Dist: rich>=10

{django_codemod-2.3.7 → django_codemod-2.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "setuptools>=77.0.3" ]
 
 [project]
 name = "django-codemod"
-version = "2.3.7"
+version = "2.4.0"
 description = "A command line tool to automatically fix Django deprecations."
 readme = "README.md"
 keywords = [
@@ -16,23 +16,23 @@ license = "MIT"
 authors = [
   { name = "Bruno Alla", email = "alla.brunoo@gmail.com" },
 ]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "Intended Audience :: Developers",
   "Natural Language :: English",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3 :: Only",
-  "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",
   "Topic :: Software Development :: Libraries",
 ]
 
 dependencies = [
-  "click<8.2",
+  "click<8.3",
   "libcst==1.8.4",
   "pathspec>=0.6,<1",
   "rich>=10",
@@ -96,6 +96,9 @@ lint.per-file-ignores."tests/**/*" = [
 ]
 lint.isort.known-first-party = [ "django_codemod", "tests" ]
 
+[tool.pyproject-fmt]
+max_supported_python = "3.14"
+
 [tool.pytest.ini_options]
 addopts = "-v -Wdefault --cov=django_codemod --cov-report=term-missing:skip-covered"
 pythonpath = [ "src" ]

django_codemod-2.4.0/src/django_codemod/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.4.0"

{django_codemod-2.3.7 → django_codemod-2.4.0}/src/django_codemod/cli.py

@@ -1,9 +1,8 @@
 import inspect
 from collections import defaultdict
-from collections.abc import Generator
+from collections.abc import Callable, Generator
 from operator import attrgetter
 from pathlib import Path
-from typing import Callable, Optional
 
 import rich_click as click
 from libcst.codemod import CodemodContext, parallel_exec_transform_with_prettyprint
@@ -68,8 +67,8 @@ class VersionParamType(click.ParamType):
     def convert(  # type: ignore[return]
         self,
         value: str,
-        param: Optional[click.Parameter],
-        ctx: Optional[click.Context],
+        param: click.Parameter | None,
+        ctx: click.Context | None,
     ) -> tuple[int, int]:
         """Parse version to keep only major an minor digits."""
         try:
@@ -84,8 +83,8 @@ class VersionParamType(click.ParamType):
     def _parse_unsafe(
         self,
         value: str,
-        param: Optional[click.Parameter],
-        ctx: Optional[click.Context],
+        param: click.Parameter | None,
+        ctx: click.Context | None,
     ) -> tuple[int, int]:
         """Parse version and validate it's a supported one."""
         parsed_version = self._split_digits(value, param, ctx)
@@ -104,8 +103,8 @@ class VersionParamType(click.ParamType):
     def _split_digits(
         self,
         value: str,
-        param: Optional[click.Parameter],
-        ctx: Optional[click.Context],
+        param: click.Parameter | None,
+        ctx: click.Context | None,
     ) -> tuple[int, int]:
         """Split version into 2-tuple of digits, ignoring patch digit."""
         values_parts = tuple(int(v) for v in value.split("."))
@@ -115,7 +114,7 @@ class VersionParamType(click.ParamType):
                 param,
                 ctx,
             )
-        major, minor, *patches = values_parts
+        major, minor, *_patches = values_parts
         return major, minor
 
 

{django_codemod-2.3.7 → django_codemod-2.4.0}/src/django_codemod/path_utils.py

@@ -7,7 +7,6 @@ https://github.com/psf/black
 
 from collections.abc import Iterable, Iterator
 from pathlib import Path
-from typing import Optional
 
 from pathspec import PathSpec
 
@@ -113,7 +112,7 @@ def gen_python_files(
             yield child
 
 
-def normalize_path(path: Path, root: Path) -> Optional[str]:
+def normalize_path(path: Path, root: Path) -> str | None:
     """Normalize `path`. May return `None` if `path` was ignored."""
     try:
         abspath = path if path.is_absolute() else Path.cwd() / path

{django_codemod-2.3.7 → django_codemod-2.4.0}/src/django_codemod/utils/calls.py

@@ -1,11 +1,10 @@
 from collections.abc import Sequence
-from typing import Optional
 
 from libcst import Arg, Call, FunctionDef, Param, parse_expression, parse_statement
 from libcst import matchers as m
 
 
-def find_keyword_arg(args: Sequence[Arg], keyword_name: str) -> Optional[Arg]:
+def find_keyword_arg(args: Sequence[Arg], keyword_name: str) -> Arg | None:
     """Find a kwarg among a sequence of arguments."""
     matcher = m.Arg(keyword=m.Name(keyword_name))
     return next((arg for arg in args if m.matches(arg, matcher)), None)

{django_codemod-2.3.7 → django_codemod-2.4.0}/src/django_codemod/visitors/admin.py

@@ -1,5 +1,3 @@
-from typing import Union
-
 from libcst import (
     BaseExpression,
     BaseSmallStatement,
@@ -35,9 +33,7 @@ class InlineHasAddPermissionsTransformer(BaseDjCodemodTransformer):
 
     def leave_ImportFrom(
         self, original_node: ImportFrom, updated_node: ImportFrom
-    ) -> Union[
-        BaseSmallStatement, FlattenSentinel[BaseSmallStatement], RemovalSentinel
-    ]:
+    ) -> BaseSmallStatement | FlattenSentinel[BaseSmallStatement] | RemovalSentinel:
         if isinstance(updated_node.names, ImportStar):
             return super().leave_ImportFrom(original_node, updated_node)
         base_cls_matcher = []
@@ -98,7 +94,7 @@ class InlineHasAddPermissionsTransformer(BaseDjCodemodTransformer):
 
     def leave_ClassDef(
         self, original_node: ClassDef, updated_node: ClassDef
-    ) -> Union[BaseStatement, FlattenSentinel[BaseStatement], RemovalSentinel]:
+    ) -> BaseStatement | FlattenSentinel[BaseStatement] | RemovalSentinel:
         self.context.scratch.pop(self.ctx_key_visiting_subclass, None)
         return super().leave_ClassDef(original_node, updated_node)
 
@@ -108,7 +104,7 @@ class InlineHasAddPermissionsTransformer(BaseDjCodemodTransformer):
 
     def leave_FunctionDef(
         self, original_node: FunctionDef, updated_node: FunctionDef
-    ) -> Union[BaseStatement, FlattenSentinel[BaseStatement], RemovalSentinel]:
+    ) -> BaseStatement | FlattenSentinel[BaseStatement] | RemovalSentinel:
         if (
             self.is_visiting_subclass
             and m.matches(

{django_codemod-2.3.7 → django_codemod-2.4.0}/src/django_codemod/visitors/base.py

@@ -2,7 +2,6 @@
 
 from abc import ABC
 from collections.abc import Sequence
-from typing import Optional, Union
 
 from libcst import (
     Arg,
@@ -53,7 +52,7 @@ class BaseDjCodemodTransformer(ContextAwareTransformer, ABC):
 
 def module_matcher(
     import_parts: Sequence[str],
-) -> Union[m.Attribute, m.Name]:
+) -> m.Attribute | m.Name:
     """Build matcher for a module given sequence of import parts."""
     # If only one element, it is just a Name
     if len(import_parts) == 1:
@@ -112,7 +111,7 @@ class BaseRenameTransformer(BaseDjCodemodTransformer, ABC):
 
     def leave_ImportFrom(
         self, original_node: ImportFrom, updated_node: ImportFrom
-    ) -> Union[BaseSmallStatement, RemovalSentinel]:
+    ) -> BaseSmallStatement | RemovalSentinel:
         """Update import statements for matching old module name."""
         return (
             self._check_import_from_exact(original_node, updated_node)
@@ -123,7 +122,7 @@ class BaseRenameTransformer(BaseDjCodemodTransformer, ABC):
 
     def _check_import_from_exact(
         self, original_node: ImportFrom, updated_node: ImportFrom
-    ) -> Optional[Union[BaseSmallStatement, RemovalSentinel]]:
+    ) -> BaseSmallStatement | RemovalSentinel | None:
         """
         Check for when the thing to replace is imported exactly.
 
@@ -171,7 +170,7 @@ class BaseRenameTransformer(BaseDjCodemodTransformer, ABC):
 
     def _check_import_from_parent(
         self, original_node: ImportFrom, updated_node: ImportFrom
-    ) -> Optional[Union[BaseSmallStatement, RemovalSentinel]]:
+    ) -> BaseSmallStatement | RemovalSentinel | None:
         """
         Check for when the parent module of thing to replace is imported.
 
@@ -200,7 +199,7 @@ class BaseRenameTransformer(BaseDjCodemodTransformer, ABC):
                     value=m.Name(module_name_str),
                     attr=m.Name(self.old_name),
                 )
-                new_as_name: Optional[str] = None
+                new_as_name: str | None = None
                 if import_alias.evaluated_alias:
                     # The import alias would be the same before and after
                     # Add a `_` to differentiate the old alias from the new one.
@@ -214,7 +213,7 @@ class BaseRenameTransformer(BaseDjCodemodTransformer, ABC):
                 if self.old_parent_module_parts != self.new_parent_module_parts:
                     # import statement might need updating: build arguments for
                     # AddImportsVisitor and RemoveImportsVisitor to update imports
-                    add_import_module: Optional[str] = None
+                    add_import_module: str | None = None
                     if self.new_parent_module_parts:
                         add_import_module = ".".join(self.new_parent_module_parts)
                     self.context.scratch[self.ctx_key_add_import_kwargs] = {
@@ -223,7 +222,7 @@ class BaseRenameTransformer(BaseDjCodemodTransformer, ABC):
                         "obj": self.new_parent_name,
                         "asname": new_as_name,
                     }
-                    remove_import_module: Optional[str] = None
+                    remove_import_module: str | None = None
                     if self.old_parent_module_parts:
                         remove_import_module = ".".join(self.old_parent_module_parts)
                     self.context.scratch[self.ctx_key_remove_import_kwargs] = {
@@ -236,7 +235,7 @@ class BaseRenameTransformer(BaseDjCodemodTransformer, ABC):
 
     def _check_import_from_child(
         self, original_node: ImportFrom, updated_node: ImportFrom
-    ) -> Optional[Union[BaseSmallStatement, RemovalSentinel]]:
+    ) -> BaseSmallStatement | RemovalSentinel | None:
         """
         Check import of a member of the module being codemodded.
 
@@ -275,7 +274,7 @@ class BaseRenameTransformer(BaseDjCodemodTransformer, ABC):
         self.context.scratch[self.ctx_key_import_scope] = scope
 
     @property
-    def import_scope(self) -> Optional[Scope]:
+    def import_scope(self) -> Scope | None:
         return self.context.scratch.get(self.ctx_key_import_scope, None)
 
     def update_imports(self):

{django_codemod-2.3.7 → django_codemod-2.4.0}/src/django_codemod/visitors/models.py

@@ -1,5 +1,4 @@
 from collections.abc import Sequence
-from typing import Optional, Union
 
 from libcst import (
     Arg,
@@ -47,9 +46,7 @@ class ModelsPermalinkTransformer(BaseDjCodemodTransformer):
 
     def leave_ImportFrom(
         self, original_node: ImportFrom, updated_node: ImportFrom
-    ) -> Union[
-        BaseSmallStatement, FlattenSentinel[BaseSmallStatement], RemovalSentinel
-    ]:
+    ) -> BaseSmallStatement | FlattenSentinel[BaseSmallStatement] | RemovalSentinel:
         if isinstance(updated_node.names, ImportStar):
             return super().leave_ImportFrom(original_node, updated_node)
         if m.matches(
@@ -105,7 +102,7 @@ class ModelsPermalinkTransformer(BaseDjCodemodTransformer):
             return matchers_list[0]
         return m.OneOf(*iter(matchers_list))
 
-    def visit_FunctionDef(self, node: FunctionDef) -> Optional[bool]:
+    def visit_FunctionDef(self, node: FunctionDef) -> bool | None:
         for decorator in node.decorators:
             if m.matches(decorator, self.decorator_matcher):
                 self.context.scratch[self.ctx_key_inside_method] = True
@@ -113,7 +110,7 @@ class ModelsPermalinkTransformer(BaseDjCodemodTransformer):
 
     def leave_FunctionDef(
         self, original_node: FunctionDef, updated_node: FunctionDef
-    ) -> Union[BaseStatement, FlattenSentinel[BaseStatement], RemovalSentinel]:
+    ) -> BaseStatement | FlattenSentinel[BaseStatement] | RemovalSentinel:
         if self.visiting_permalink_method:
             for decorator in updated_node.decorators:
                 if m.matches(decorator, self.decorator_matcher):
@@ -136,9 +133,7 @@ class ModelsPermalinkTransformer(BaseDjCodemodTransformer):
 
     def leave_Return(
         self, original_node: Return, updated_node: Return
-    ) -> Union[
-        BaseSmallStatement, FlattenSentinel[BaseSmallStatement], RemovalSentinel
-    ]:
+    ) -> BaseSmallStatement | FlattenSentinel[BaseSmallStatement] | RemovalSentinel:
         if self.visiting_permalink_method and m.matches(
             updated_node.value,
             m.Tuple(),  # type: ignore

{django_codemod-2.3.7 → django_codemod-2.4.0}/src/django_codemod/visitors/signals.py

@@ -1,4 +1,4 @@
-from typing import ClassVar, Optional
+from typing import ClassVar
 
 from libcst import BaseExpression, Call, ImportFrom, ImportStar, MaybeSentinel, Module
 from libcst import matchers as m
@@ -45,7 +45,7 @@ class SignalDisconnectWeakTransformer(BaseDjCodemodTransformer):
         self.context.scratch.pop(self.ctx_key_call_matchers, None)
         return super().leave_Module(original_node, updated_node)
 
-    def visit_ImportFrom(self, node: ImportFrom) -> Optional[bool]:
+    def visit_ImportFrom(self, node: ImportFrom) -> bool | None:
         """Set the `Call` matcher depending on which signals are imported.."""
         if not import_from_matches(
             node, ["django", "db", "models", "signals"]

{django_codemod-2.3.7 → django_codemod-2.4.0}/src/django_codemod/visitors/template_tags.py

@@ -1,5 +1,4 @@
 from collections.abc import Generator, Sequence
-from typing import Optional, Union
 
 from libcst import (
     Assign,
@@ -29,11 +28,11 @@ class AssignmentTagTransformer(BaseDjCodemodTransformer):
     ctx_key_decorator_matcher = f"{ctx_key_prefix}-decorator_matcher"
 
     @property
-    def library_call_matcher(self) -> Optional[m.Call]:
+    def library_call_matcher(self) -> m.Call | None:
         return self.context.scratch.get(self.ctx_key_library_call_matcher, None)
 
     @property
-    def decorators_matcher(self) -> Optional[m.BaseMatcherNode]:
+    def decorators_matcher(self) -> m.BaseMatcherNode | None:
         return self.context.scratch.get(self.ctx_key_decorator_matcher, None)
 
     def leave_Module(self, original_node: Module, updated_node: Module) -> Module:
@@ -42,7 +41,7 @@ class AssignmentTagTransformer(BaseDjCodemodTransformer):
         self.context.scratch.pop(self.ctx_key_decorator_matcher, None)
         return super().leave_Module(original_node, updated_node)
 
-    def visit_ImportFrom(self, node: ImportFrom) -> Optional[bool]:
+    def visit_ImportFrom(self, node: ImportFrom) -> bool | None:
         """Record whether an interesting import is detected."""
         import_matcher = (
             # django.template
@@ -54,7 +53,7 @@ class AssignmentTagTransformer(BaseDjCodemodTransformer):
             self.context.scratch[self.ctx_key_library_call_matcher] = import_matcher
         return None
 
-    def _template_import_matcher(self, node: ImportFrom) -> Optional[m.Call]:
+    def _template_import_matcher(self, node: ImportFrom) -> m.Call | None:
         """Return matcher if django.template is imported."""
         imported_name_str = self._get_imported_name(node, "django.template")
         if not imported_name_str:
@@ -66,7 +65,7 @@ class AssignmentTagTransformer(BaseDjCodemodTransformer):
             )
         )
 
-    def _library_import_matcher(self, node: ImportFrom) -> Optional[m.Call]:
+    def _library_import_matcher(self, node: ImportFrom) -> m.Call | None:
         """Return matcher if django.template.Library is imported."""
         imported_name_str = self._get_imported_name(node, "django.template.Library")
         if not imported_name_str:
@@ -75,7 +74,7 @@ class AssignmentTagTransformer(BaseDjCodemodTransformer):
         return m.Call(func=m.Name(imported_name_str))
 
     @staticmethod
-    def _get_imported_name(node: ImportFrom, import_path: str) -> Optional[str]:
+    def _get_imported_name(node: ImportFrom, import_path: str) -> str | None:
         """Resolve the imported name if present."""
         if isinstance(node.names, ImportStar):
             return None
@@ -92,7 +91,7 @@ class AssignmentTagTransformer(BaseDjCodemodTransformer):
                 return imported_name_str
         return None
 
-    def visit_Assign(self, node: Assign) -> Optional[bool]:
+    def visit_Assign(self, node: Assign) -> bool | None:
         """Record variable name the `Library()` call is assigned to."""
         if self.library_call_matcher and m.matches(
             node,
@@ -127,7 +126,7 @@ class AssignmentTagTransformer(BaseDjCodemodTransformer):
 
     def leave_Decorator(
         self, original_node: Decorator, updated_node: Decorator
-    ) -> Union[Decorator, FlattenSentinel[Decorator], RemovalSentinel]:
+    ) -> Decorator | FlattenSentinel[Decorator] | RemovalSentinel:
         """Update decorator call if all conditions are met."""
         if self.decorators_matcher and m.matches(updated_node, self.decorators_matcher):
             # If we have a decorator matcher, and it matches,

{django_codemod-2.3.7 → django_codemod-2.4.0/src/django_codemod.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-codemod
-Version: 2.3.7
+Version: 2.4.0
 Summary: A command line tool to automatically fix Django deprecations.
 Author-email: Bruno Alla <alla.brunoo@gmail.com>
 License-Expression: MIT
@@ -16,16 +16,16 @@ Classifier: Intended Audience :: Developers
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: click<8.2
+Requires-Dist: click<8.3
 Requires-Dist: libcst==1.8.4
 Requires-Dist: pathspec<1,>=0.6
 Requires-Dist: rich>=10

{django_codemod-2.3.7 → django_codemod-2.4.0}/src/django_codemod.egg-info/requires.txt

@@ -1,4 +1,4 @@
-click<8.2
+click<8.3
 libcst==1.8.4
 pathspec<1,>=0.6
 rich>=10

{django_codemod-2.3.7 → django_codemod-2.4.0}/tests/test_cli.py

@@ -94,8 +94,8 @@ def test_run_help(cli_runner):
         ["run", "--help"],
     )
 
-    assert result.exit_code == 0
-    assert "djcodemod list" in result.output
+    assert result.exit_code == 1
+    assert "Automatically fixes deprecations" in result.output
 
 
 @pytest.mark.parametrize(

django_codemod-2.3.7/src/django_codemod/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.3.7"