openrewrite-migrate-python 0.10.0.dev20260714174242__tar.gz → 0.10.0.dev20260715111001__tar.gz

{openrewrite_migrate_python-0.10.0.dev20260714174242 → openrewrite_migrate_python-0.10.0.dev20260715111001}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.10.0.dev20260714174242
+Version: 0.10.0.dev20260715111001
 Summary: OpenRewrite recipes for migrating Python codebases to newer Python versions.
 Author-email: "Moderne Inc." <support@moderne.io>
 License: Moderne Proprietary

{openrewrite_migrate_python-0.10.0.dev20260714174242 → openrewrite_migrate_python-0.10.0.dev20260715111001}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "openrewrite-migrate-python"
 description = "OpenRewrite recipes for migrating Python codebases to newer Python versions."
-version = "0.10.0.dev20260714174242"  # Updated dynamically during release
+version = "0.10.0.dev20260715111001"  # Updated dynamically during release
 authors = [{ name = "Moderne Inc.", email = "support@moderne.io" }]
 license = { text = "Moderne Proprietary" }
 readme = "README.md"

{openrewrite_migrate_python-0.10.0.dev20260714174242 → openrewrite_migrate_python-0.10.0.dev20260715111001}/src/openrewrite_migrate_python/migrate/__init__.py

@@ -30,6 +30,7 @@ from .ast_deprecations import (
 )
 from .asyncio_coroutine_to_async import MigrateAsyncioCoroutine
 from .asyncio_deprecations import FindAsyncioCoroutineDecorator
+from .avro_migrations import MigrateAvroPython3ToAvro
 from .calendar_deprecations import ReplaceCalendarConstants
 from .cgi_migrations import FindCgiModule, FindCgitbModule
 from .cgi_parse_deprecations import ReplaceCgiParseQs, ReplaceCgiParseQsl
@@ -192,6 +193,7 @@ __all__ = [
     "ReplaceAstStr",
     # Auto-fix: Asyncio
     "MigrateAsyncioCoroutine",
+    "MigrateAvroPython3ToAvro",
     # Auto-fix: Calendar
     "ReplaceCalendarConstants",
     # Auto-fix: Collections

openrewrite_migrate_python-0.10.0.dev20260715111001/src/openrewrite_migrate_python/migrate/avro_migrations.py

@@ -0,0 +1,53 @@
+"""Recipe for migrating the deprecated ``avro-python3`` package to Apache ``avro``."""
+
+from typing import List
+
+from rewrite import Recipe
+from rewrite.category import CategoryDescriptor
+from rewrite.decorators import categorize
+from rewrite.marketplace import Python
+from rewrite.rpc import RpcRecipe
+from rewrite.python.recipes import ChangeType
+
+# Define category path: Python > Migrate
+_Migrate = [*Python, CategoryDescriptor(display_name="Migrate")]
+
+
+@categorize(_Migrate)
+class MigrateAvroPython3ToAvro(Recipe):
+
+    @property
+    def name(self) -> str:
+        return "org.openrewrite.python.migrate.MigrateAvroPython3ToAvro"
+
+    @property
+    def display_name(self) -> str:
+        return "Migrate the deprecated `avro-python3` package to `avro`"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Replace the deprecated `avro-python3` distribution with its maintained successor, "
+            "Apache `avro`. Both install the same top-level `avro` import package, so module imports "
+            "are unchanged, but `avro-python3`'s `avro.schema.Parse` was renamed to the lowercase "
+            "`avro.schema.parse` (and `Parse` removed) in `avro` 1.11+, so that reference is "
+            "rewritten. The dependency swap is applied by `org.openrewrite.python.ChangeDependency`."
+        )
+
+    @property
+    def tags(self) -> List[str]:
+        return ["python", "migration", "avro", "dependencies"]
+
+    def recipe_list(self) -> List[Recipe]:
+        return [
+            ChangeType(
+                old_fully_qualified_type_name="avro.schema.Parse",
+                new_fully_qualified_type_name="avro.schema.parse",
+            ),
+            RpcRecipe(
+                "org.openrewrite.python.ChangeDependency",
+                oldPackageName="avro-python3",
+                newPackageName="avro",
+                newVersion=">=1.11.3",
+            ),
+        ]

{openrewrite_migrate_python-0.10.0.dev20260714174242 → openrewrite_migrate_python-0.10.0.dev20260715111001}/src/openrewrite_migrate_python/migrate/typing_callable.py

@@ -15,7 +15,7 @@ from rewrite import Recipe
 from rewrite.category import CategoryDescriptor
 from rewrite.decorators import categorize
 from rewrite.marketplace import Python
-from rewrite.python.recipes import ChangeImport
+from rewrite.python.recipes import ChangeType
 
 # Define category path
 _Python39 = [
@@ -59,4 +59,9 @@ class ReplaceTypingCallableWithCollectionsAbcCallable(Recipe):
         )
 
     def recipe_list(self) -> List[Recipe]:
-        return [ChangeImport(old_module="typing", old_name="Callable", new_module="collections.abc")]
+        return [
+            ChangeType(
+                old_fully_qualified_type_name="typing.Callable",
+                new_fully_qualified_type_name="collections.abc.Callable",
+            )
+        ]

{openrewrite_migrate_python-0.10.0.dev20260714174242 → openrewrite_migrate_python-0.10.0.dev20260715111001}/src/openrewrite_migrate_python/migrate/upgrade_to_python313.py

@@ -47,7 +47,9 @@ class UpgradeToPython313(Recipe):
         return (
             "Migrate deprecated and removed APIs for Python 3.13 compatibility. "
             "This includes detecting usage of modules removed in PEP 594 "
-            "('dead batteries') and other API changes between Python 3.12 and 3.13."
+            "('dead batteries'), other API changes between Python 3.12 and 3.13, and bumping "
+            "third-party dependencies (`ruff`, `avro-python3`) whose pinned releases do not "
+            "install cleanly on Python 3.13."
         )
 
     @property
@@ -107,6 +109,11 @@ class UpgradeToPython313(Recipe):
             FindTelnetlibModule(),
             FindUuModule(),
             FindXdrlibModule(),
+            # Bump third-party pins that don't install cleanly on 3.13 (avro-python3 off its fragile 1.8.2 sdist).
+            RpcRecipe("org.openrewrite.python.UpgradeDependencyVersion",
+                      packageName="ruff", newVersion=">=0.15.21"),
+            RpcRecipe("org.openrewrite.python.UpgradeDependencyVersion",
+                      packageName="avro-python3", newVersion=">=1.10.2"),
             # Update project metadata, packaging, Dockerfiles, CloudFormation templates, and .whitesource files to the target version
             RpcRecipe("org.openrewrite.python.migrate.UpgradePythonVersionTo313"),
         ]

openrewrite_migrate_python-0.10.0.dev20260715111001/src/openrewrite_migrate_python/migrate/upgrade_to_python39.py

@@ -0,0 +1,130 @@
+"""Composite recipe for upgrading from Python 3.8 to Python 3.9."""
+
+from typing import List
+
+from rewrite import Recipe
+from rewrite.category import CategoryDescriptor
+from rewrite.decorators import categorize
+from rewrite.marketplace import Python
+from rewrite.rpc import RpcRecipe
+from rewrite.python.recipes import ChangeImport, ChangeType
+
+# Define category path: Python > Migrate
+_Migrate = [*Python, CategoryDescriptor(display_name="Migrate")]
+
+
+@categorize(_Migrate)
+class UpgradeToPython39(Recipe):
+    """
+    Migrate deprecated APIs for Python 3.9 compatibility.
+
+    This composite recipe applies all necessary migrations for code
+    running on Python 3.8 to be compatible with Python 3.9.
+
+    Key changes in Python 3.9:
+    - PEP 585: Built-in generics (`list[int]` instead of `typing.List[int]`)
+    - `base64.encodestring()` / `decodestring()` removed
+    - `Element.getiterator()` deprecated (use `iter()`)
+    - `Element.getchildren()` deprecated (use `list(element)`)
+    - `typing.Callable` deprecated in favor of `collections.abc.Callable`
+
+    See: https://docs.python.org/3/whatsnew/3.9.html
+    """
+
+    @property
+    def name(self) -> str:
+        return "org.openrewrite.python.migrate.UpgradeToPython39"
+
+    @property
+    def display_name(self) -> str:
+        return "Upgrade to Python 3.9"
+
+    @property
+    def description(self) -> str:
+        return (
+            "Migrate deprecated APIs for Python 3.9 compatibility. "
+            "This includes PEP 585 built-in generics, removed base64 functions, "
+            "and deprecated XML Element methods."
+        )
+
+    @property
+    def tags(self) -> List[str]:
+        return ["python", "migration", "3.9"]
+
+    def recipe_list(self) -> List[Recipe]:
+        """Return the list of recipes to apply for Python 3.9 upgrade."""
+        from .html_parser_deprecations import ReplaceHtmlParserUnescape
+        from .threading_is_alive_deprecation import ReplaceThreadIsAlive
+        from .typing_callable import ReplaceTypingCallableWithCollectionsAbcCallable
+        from .upgrade_to_python38 import UpgradeToPython38
+        from .xml_deprecations import ReplaceElementGetchildren, ReplaceElementGetiterator
+
+        return [
+            # First apply all Python 3.8 upgrades
+            UpgradeToPython38(),
+            # base64 encodestring/decodestring removed in Python 3.9.
+            # These are functions, not types, so they stay on ChangeImport
+            ChangeImport(old_module="base64", old_name="encodestring", new_module="base64", new_name="encodebytes"),
+            ChangeImport(old_module="base64", old_name="decodestring", new_module="base64", new_name="decodebytes"),
+            # PEP 585: Replace typing.List[X] with list[X], etc. (Python 3.9+).
+            # These targets are genuine types (typing.List, typing.Mapping, ...) with ChangeType
+            ChangeType(old_fully_qualified_type_name="typing.List", new_fully_qualified_type_name="builtins.list"),
+            ChangeType(old_fully_qualified_type_name="typing.Dict", new_fully_qualified_type_name="builtins.dict"),
+            ChangeType(old_fully_qualified_type_name="typing.Set", new_fully_qualified_type_name="builtins.set"),
+            ChangeType(old_fully_qualified_type_name="typing.FrozenSet", new_fully_qualified_type_name="builtins.frozenset"),
+            ChangeType(old_fully_qualified_type_name="typing.Tuple", new_fully_qualified_type_name="builtins.tuple"),
+            ChangeType(old_fully_qualified_type_name="typing.Type", new_fully_qualified_type_name="builtins.type"),
+            # typing.Callable -> collections.abc.Callable (PEP 585)
+            ReplaceTypingCallableWithCollectionsAbcCallable(),
+            # PEP 585: typing -> collections replacements
+            ChangeType(old_fully_qualified_type_name="typing.Deque", new_fully_qualified_type_name="collections.deque"),
+            ChangeType(old_fully_qualified_type_name="typing.DefaultDict", new_fully_qualified_type_name="collections.defaultdict"),
+            ChangeType(old_fully_qualified_type_name="typing.OrderedDict", new_fully_qualified_type_name="collections.OrderedDict"),
+            ChangeType(old_fully_qualified_type_name="typing.Counter", new_fully_qualified_type_name="collections.Counter"),
+            ChangeType(old_fully_qualified_type_name="typing.ChainMap", new_fully_qualified_type_name="collections.ChainMap"),
+            # PEP 585: typing -> re replacements
+            ChangeType(old_fully_qualified_type_name="typing.Pattern", new_fully_qualified_type_name="re.Pattern"),
+            ChangeType(old_fully_qualified_type_name="typing.Match", new_fully_qualified_type_name="re.Match"),
+            # PEP 585: typing -> contextlib replacements
+            ChangeType(old_fully_qualified_type_name="typing.ContextManager", new_fully_qualified_type_name="contextlib.AbstractContextManager"),
+            ChangeType(old_fully_qualified_type_name="typing.AsyncContextManager", new_fully_qualified_type_name="contextlib.AbstractAsyncContextManager"),
+            # PEP 585: typing -> collections.abc replacements
+            ChangeType(old_fully_qualified_type_name="typing.Iterable", new_fully_qualified_type_name="collections.abc.Iterable"),
+            ChangeType(old_fully_qualified_type_name="typing.Iterator", new_fully_qualified_type_name="collections.abc.Iterator"),
+            ChangeType(old_fully_qualified_type_name="typing.Generator", new_fully_qualified_type_name="collections.abc.Generator"),
+            ChangeType(old_fully_qualified_type_name="typing.Sequence", new_fully_qualified_type_name="collections.abc.Sequence"),
+            ChangeType(old_fully_qualified_type_name="typing.MutableSequence", new_fully_qualified_type_name="collections.abc.MutableSequence"),
+            ChangeType(old_fully_qualified_type_name="typing.Mapping", new_fully_qualified_type_name="collections.abc.Mapping"),
+            ChangeType(old_fully_qualified_type_name="typing.MutableMapping", new_fully_qualified_type_name="collections.abc.MutableMapping"),
+            ChangeType(old_fully_qualified_type_name="typing.AbstractSet", new_fully_qualified_type_name="collections.abc.Set"),
+            ChangeType(old_fully_qualified_type_name="typing.MutableSet", new_fully_qualified_type_name="collections.abc.MutableSet"),
+            ChangeType(old_fully_qualified_type_name="typing.Awaitable", new_fully_qualified_type_name="collections.abc.Awaitable"),
+            ChangeType(old_fully_qualified_type_name="typing.Coroutine", new_fully_qualified_type_name="collections.abc.Coroutine"),
+            ChangeType(old_fully_qualified_type_name="typing.AsyncIterable", new_fully_qualified_type_name="collections.abc.AsyncIterable"),
+            ChangeType(old_fully_qualified_type_name="typing.AsyncIterator", new_fully_qualified_type_name="collections.abc.AsyncIterator"),
+            ChangeType(old_fully_qualified_type_name="typing.AsyncGenerator", new_fully_qualified_type_name="collections.abc.AsyncGenerator"),
+            ChangeType(old_fully_qualified_type_name="typing.Reversible", new_fully_qualified_type_name="collections.abc.Reversible"),
+            ChangeType(old_fully_qualified_type_name="typing.Container", new_fully_qualified_type_name="collections.abc.Container"),
+            ChangeType(old_fully_qualified_type_name="typing.Collection", new_fully_qualified_type_name="collections.abc.Collection"),
+            ChangeType(old_fully_qualified_type_name="typing.MappingView", new_fully_qualified_type_name="collections.abc.MappingView"),
+            ChangeType(old_fully_qualified_type_name="typing.KeysView", new_fully_qualified_type_name="collections.abc.KeysView"),
+            ChangeType(old_fully_qualified_type_name="typing.ItemsView", new_fully_qualified_type_name="collections.abc.ItemsView"),
+            ChangeType(old_fully_qualified_type_name="typing.ValuesView", new_fully_qualified_type_name="collections.abc.ValuesView"),
+            ChangeType(old_fully_qualified_type_name="typing.Hashable", new_fully_qualified_type_name="collections.abc.Hashable"),
+            ChangeType(old_fully_qualified_type_name="typing.Sized", new_fully_qualified_type_name="collections.abc.Sized"),
+            # XML Element.getiterator() deprecated in 3.9, use iter()
+            ReplaceElementGetiterator(),
+            # XML Element.getchildren() -> list(element) (3.9)
+            ReplaceElementGetchildren(),
+            # fractions.gcd() removed in 3.9, use math.gcd() (function -> ChangeImport, not ChangeType)
+            ChangeImport(old_module="fractions", old_name="gcd", new_module="math"),
+            # sys.getcheckinterval/setcheckinterval removed in 3.9 (functions -> ChangeImport)
+            ChangeImport(old_module="sys", old_name="getcheckinterval", new_module="sys", new_name="getswitchinterval"),
+            ChangeImport(old_module="sys", old_name="setcheckinterval", new_module="sys", new_name="setswitchinterval"),
+            # Thread.isAlive() removed in 3.9
+            ReplaceThreadIsAlive(),
+            # HTMLParser.unescape() -> html.unescape() (removed in 3.9)
+            ReplaceHtmlParserUnescape(),
+            # Update project metadata, packaging, Dockerfiles, CloudFormation templates, and .whitesource files to the target version
+            RpcRecipe("org.openrewrite.python.migrate.UpgradePythonVersionTo39"),
+        ]

{openrewrite_migrate_python-0.10.0.dev20260714174242 → openrewrite_migrate_python-0.10.0.dev20260715111001}/src/openrewrite_migrate_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.10.0.dev20260714174242
+Version: 0.10.0.dev20260715111001
 Summary: OpenRewrite recipes for migrating Python codebases to newer Python versions.
 Author-email: "Moderne Inc." <support@moderne.io>
 License: Moderne Proprietary

{openrewrite_migrate_python-0.10.0.dev20260714174242 → openrewrite_migrate_python-0.10.0.dev20260715111001}/src/openrewrite_migrate_python.egg-info/SOURCES.txt

@@ -25,6 +25,7 @@ src/openrewrite_migrate_python/migrate/array_deprecations.py
 src/openrewrite_migrate_python/migrate/ast_deprecations.py
 src/openrewrite_migrate_python/migrate/asyncio_coroutine_to_async.py
 src/openrewrite_migrate_python/migrate/asyncio_deprecations.py
+src/openrewrite_migrate_python/migrate/avro_migrations.py
 src/openrewrite_migrate_python/migrate/calendar_deprecations.py
 src/openrewrite_migrate_python/migrate/cgi_migrations.py
 src/openrewrite_migrate_python/migrate/cgi_parse_deprecations.py
@@ -91,9 +92,11 @@ tests/test_array_deprecations.py
 tests/test_ast_deprecations.py
 tests/test_asyncio_coroutine_to_async.py
 tests/test_asyncio_deprecations.py
+tests/test_avro_migrations.py
 tests/test_calendar_deprecations.py
 tests/test_cgi_parse_deprecations.py
 tests/test_change_import_recipes.py
+tests/test_change_type_recipes.py
 tests/test_collections_abc_migrations.py
 tests/test_configparser_deprecations.py
 tests/test_datetime_utc.py

openrewrite_migrate_python-0.10.0.dev20260715111001/tests/test_avro_migrations.py

@@ -0,0 +1,32 @@
+"""Tests for the avro-python3 -> avro migration recipe.
+
+The recipe is composed of RPC-delegated recipes (``ChangeType`` and ``ChangeDependency``), which run
+in the Moderne runtime; these tests assert the composite wires them with the correct options.
+"""
+
+from openrewrite_migrate_python.migrate import MigrateAvroPython3ToAvro
+from rewrite.python.recipes import ChangeType
+from rewrite.rpc import RpcRecipe
+
+
+class TestMigrateAvroPython3ToAvroStructure:
+
+    def test_change_type_rewrites_parse_reference(self):
+        recipe_list = MigrateAvroPython3ToAvro().recipe_list()
+        assert any(
+            isinstance(r, ChangeType) and
+            r.old_fully_qualified_type_name == "avro.schema.Parse" and
+            r.new_fully_qualified_type_name == "avro.schema.parse"
+            for r in recipe_list
+        )
+
+    def test_dependency_swap_delegates_over_rpc(self):
+        recipe_list = MigrateAvroPython3ToAvro().recipe_list()
+        rpc = [r for r in recipe_list if isinstance(r, RpcRecipe)]
+        assert len(rpc) == 1
+        assert rpc[0].name == "org.openrewrite.python.ChangeDependency"
+        assert rpc[0].delegates_to_options == {
+            "oldPackageName": "avro-python3",
+            "newPackageName": "avro",
+            "newVersion": ">=1.11.3",
+        }

openrewrite_migrate_python-0.10.0.dev20260715111001/tests/test_change_type_recipes.py

@@ -0,0 +1,65 @@
+"""Structural tests for the ChangeType-based typing.* renames in UpgradeToPython39.
+
+ChangeType delegates to the JVM peer, so it can't be run in this harness; these assert wiring.
+"""
+
+from openrewrite_migrate_python.migrate import UpgradeToPython39
+from rewrite.python.recipes import ChangeType
+
+
+def _change_type_pairs(recipe):
+    return {
+        (r.old_fully_qualified_type_name, r.new_fully_qualified_type_name)
+        for r in recipe.recipe_list()
+        if isinstance(r, ChangeType)
+    }
+
+
+class TestUpgradeToPython39TypingChangeTypes:
+    def test_wires_pep585_typing_renames(self):
+        expected = {
+            ("typing.List", "builtins.list"),
+            ("typing.Dict", "builtins.dict"),
+            ("typing.Set", "builtins.set"),
+            ("typing.FrozenSet", "builtins.frozenset"),
+            ("typing.Tuple", "builtins.tuple"),
+            ("typing.Type", "builtins.type"),
+            ("typing.Deque", "collections.deque"),
+            ("typing.DefaultDict", "collections.defaultdict"),
+            ("typing.OrderedDict", "collections.OrderedDict"),
+            ("typing.Counter", "collections.Counter"),
+            ("typing.ChainMap", "collections.ChainMap"),
+            ("typing.Pattern", "re.Pattern"),
+            ("typing.Match", "re.Match"),
+            ("typing.ContextManager", "contextlib.AbstractContextManager"),
+            ("typing.AsyncContextManager", "contextlib.AbstractAsyncContextManager"),
+            ("typing.Iterable", "collections.abc.Iterable"),
+            ("typing.Iterator", "collections.abc.Iterator"),
+            ("typing.Generator", "collections.abc.Generator"),
+            ("typing.Sequence", "collections.abc.Sequence"),
+            ("typing.MutableSequence", "collections.abc.MutableSequence"),
+            ("typing.Mapping", "collections.abc.Mapping"),
+            ("typing.MutableMapping", "collections.abc.MutableMapping"),
+            ("typing.AbstractSet", "collections.abc.Set"),
+            ("typing.MutableSet", "collections.abc.MutableSet"),
+            ("typing.Awaitable", "collections.abc.Awaitable"),
+            ("typing.Coroutine", "collections.abc.Coroutine"),
+            ("typing.AsyncIterable", "collections.abc.AsyncIterable"),
+            ("typing.AsyncIterator", "collections.abc.AsyncIterator"),
+            ("typing.AsyncGenerator", "collections.abc.AsyncGenerator"),
+            ("typing.Reversible", "collections.abc.Reversible"),
+            ("typing.Container", "collections.abc.Container"),
+            ("typing.Collection", "collections.abc.Collection"),
+            ("typing.MappingView", "collections.abc.MappingView"),
+            ("typing.KeysView", "collections.abc.KeysView"),
+            ("typing.ItemsView", "collections.abc.ItemsView"),
+            ("typing.ValuesView", "collections.abc.ValuesView"),
+            ("typing.Hashable", "collections.abc.Hashable"),
+            ("typing.Sized", "collections.abc.Sized"),
+        }
+        assert expected <= _change_type_pairs(UpgradeToPython39())
+
+    def test_function_renames_are_not_change_type(self):
+        # These are functions, not types; they must NOT be wired as ChangeType.
+        pairs = _change_type_pairs(UpgradeToPython39())
+        assert not any(old.startswith(("base64.", "fractions.", "sys.")) for old, _ in pairs)

openrewrite_migrate_python-0.10.0.dev20260715111001/tests/test_typing_callable.py

@@ -0,0 +1,25 @@
+"""Tests for the typing.Callable migration recipe.
+
+The recipe now delegates to the RPC-backed ``ChangeType`` (Java's
+``org.openrewrite.java.ChangeType``), which rewrites the ``typing.Callable`` reference
+across both the ``from typing import Callable`` and qualified ``typing.Callable`` forms and
+updates imports. ``ChangeType`` requires the JVM peer and is exercised in the Moderne runtime
+rather than in this pytest harness, so this test is structural: it asserts the recipe wires
+``ChangeType`` with the correct old/new fully-qualified names.
+"""
+
+from rewrite.python.recipes import ChangeType
+from openrewrite_migrate_python.migrate.typing_callable import (
+    ReplaceTypingCallableWithCollectionsAbcCallable,
+)
+
+
+class TestReplaceTypingCallableWithCollectionsAbcCallable:
+    def test_wires_change_type_for_callable(self):
+        recipe_list = ReplaceTypingCallableWithCollectionsAbcCallable().recipe_list()
+        change_types = [r for r in recipe_list if isinstance(r, ChangeType)]
+        assert any(
+            r.old_fully_qualified_type_name == "typing.Callable"
+            and r.new_fully_qualified_type_name == "collections.abc.Callable"
+            for r in change_types
+        )

{openrewrite_migrate_python-0.10.0.dev20260714174242 → openrewrite_migrate_python-0.10.0.dev20260715111001}/tests/test_upgrade_recipes.py

@@ -9,6 +9,7 @@ from openrewrite_migrate_python.migrate import (
     UpgradeToPython313,
     UpgradeToPython314,
 )
+from rewrite.rpc import RpcRecipe
 
 class TestUpgradeRecipeChaining:
     """Tests for verifying upgrade recipe chaining."""
@@ -79,6 +80,17 @@ class TestUpgradeRecipeChaining:
         assert "org.openrewrite.python.migrate.UpgradeToPython39" in all_names
         assert "org.openrewrite.python.migrate.UpgradeToPython38" in all_names
 
+    def test_upgrade_to_python313_bumps_incompatible_dependencies(self):
+        """UpgradeToPython313 inlines the 3.13-incompatible dependency bumps over RPC."""
+        recipe_list = UpgradeToPython313().recipe_list()
+        dep_bumps = {
+            (r.delegates_to_options.get("packageName"), r.delegates_to_options.get("newVersion"))
+            for r in recipe_list
+            if isinstance(r, RpcRecipe) and r.name == "org.openrewrite.python.UpgradeDependencyVersion"
+        }
+        assert ("ruff", ">=0.15.21") in dep_bumps
+        assert ("avro-python3", ">=1.10.2") in dep_bumps
+
     def test_each_composite_calls_its_file_upgrade_recipe(self):
         """Each composite must call the Java project-file recipe for its own version."""
         cases = [

openrewrite_migrate_python-0.10.0.dev20260714174242/src/openrewrite_migrate_python/migrate/upgrade_to_python39.py

@@ -1,128 +0,0 @@
-"""Composite recipe for upgrading from Python 3.8 to Python 3.9."""
-
-from typing import List
-
-from rewrite import Recipe
-from rewrite.category import CategoryDescriptor
-from rewrite.decorators import categorize
-from rewrite.marketplace import Python
-from rewrite.rpc import RpcRecipe
-from rewrite.python.recipes import ChangeImport
-
-# Define category path: Python > Migrate
-_Migrate = [*Python, CategoryDescriptor(display_name="Migrate")]
-
-
-@categorize(_Migrate)
-class UpgradeToPython39(Recipe):
-    """
-    Migrate deprecated APIs for Python 3.9 compatibility.
-
-    This composite recipe applies all necessary migrations for code
-    running on Python 3.8 to be compatible with Python 3.9.
-
-    Key changes in Python 3.9:
-    - PEP 585: Built-in generics (`list[int]` instead of `typing.List[int]`)
-    - `base64.encodestring()` / `decodestring()` removed
-    - `Element.getiterator()` deprecated (use `iter()`)
-    - `Element.getchildren()` deprecated (use `list(element)`)
-    - `typing.Callable` deprecated in favor of `collections.abc.Callable`
-
-    See: https://docs.python.org/3/whatsnew/3.9.html
-    """
-
-    @property
-    def name(self) -> str:
-        return "org.openrewrite.python.migrate.UpgradeToPython39"
-
-    @property
-    def display_name(self) -> str:
-        return "Upgrade to Python 3.9"
-
-    @property
-    def description(self) -> str:
-        return (
-            "Migrate deprecated APIs for Python 3.9 compatibility. "
-            "This includes PEP 585 built-in generics, removed base64 functions, "
-            "and deprecated XML Element methods."
-        )
-
-    @property
-    def tags(self) -> List[str]:
-        return ["python", "migration", "3.9"]
-
-    def recipe_list(self) -> List[Recipe]:
-        """Return the list of recipes to apply for Python 3.9 upgrade."""
-        from .html_parser_deprecations import ReplaceHtmlParserUnescape
-        from .threading_is_alive_deprecation import ReplaceThreadIsAlive
-        from .typing_callable import ReplaceTypingCallableWithCollectionsAbcCallable
-        from .upgrade_to_python38 import UpgradeToPython38
-        from .xml_deprecations import ReplaceElementGetchildren, ReplaceElementGetiterator
-
-        return [
-            # First apply all Python 3.8 upgrades
-            UpgradeToPython38(),
-            # base64 encodestring/decodestring removed in Python 3.9
-            ChangeImport(old_module="base64", old_name="encodestring", new_module="base64", new_name="encodebytes"),
-            ChangeImport(old_module="base64", old_name="decodestring", new_module="base64", new_name="decodebytes"),
-            # PEP 585: Replace typing.List[X] with list[X], etc. (Python 3.9+)
-            ChangeImport(old_module="typing", old_name="List", new_module="builtins", new_name="list"),
-            ChangeImport(old_module="typing", old_name="Dict", new_module="builtins", new_name="dict"),
-            ChangeImport(old_module="typing", old_name="Set", new_module="builtins", new_name="set"),
-            ChangeImport(old_module="typing", old_name="FrozenSet", new_module="builtins", new_name="frozenset"),
-            ChangeImport(old_module="typing", old_name="Tuple", new_module="builtins", new_name="tuple"),
-            ChangeImport(old_module="typing", old_name="Type", new_module="builtins", new_name="type"),
-            # typing.Callable -> collections.abc.Callable (PEP 585)
-            ReplaceTypingCallableWithCollectionsAbcCallable(),
-            # PEP 585: typing -> collections replacements
-            ChangeImport(old_module="typing", old_name="Deque", new_module="collections", new_name="deque"),
-            ChangeImport(old_module="typing", old_name="DefaultDict", new_module="collections", new_name="defaultdict"),
-            ChangeImport(old_module="typing", old_name="OrderedDict", new_module="collections"),
-            ChangeImport(old_module="typing", old_name="Counter", new_module="collections"),
-            ChangeImport(old_module="typing", old_name="ChainMap", new_module="collections"),
-            # PEP 585: typing -> re replacements
-            ChangeImport(old_module="typing", old_name="Pattern", new_module="re"),
-            ChangeImport(old_module="typing", old_name="Match", new_module="re"),
-            # PEP 585: typing -> contextlib replacements
-            ChangeImport(old_module="typing", old_name="ContextManager", new_module="contextlib", new_name="AbstractContextManager"),
-            ChangeImport(old_module="typing", old_name="AsyncContextManager", new_module="contextlib", new_name="AbstractAsyncContextManager"),
-            # PEP 585: typing -> collections.abc replacements
-            ChangeImport(old_module="typing", old_name="Iterable", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="Iterator", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="Generator", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="Sequence", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="MutableSequence", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="Mapping", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="MutableMapping", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="AbstractSet", new_module="collections.abc", new_name="Set"),
-            ChangeImport(old_module="typing", old_name="MutableSet", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="Awaitable", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="Coroutine", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="AsyncIterable", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="AsyncIterator", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="AsyncGenerator", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="Reversible", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="Container", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="Collection", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="MappingView", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="KeysView", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="ItemsView", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="ValuesView", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="Hashable", new_module="collections.abc"),
-            ChangeImport(old_module="typing", old_name="Sized", new_module="collections.abc"),
-            # XML Element.getiterator() deprecated in 3.9, use iter()
-            ReplaceElementGetiterator(),
-            # XML Element.getchildren() -> list(element) (3.9)
-            ReplaceElementGetchildren(),
-            # fractions.gcd() removed in 3.9, use math.gcd()
-            ChangeImport(old_module="fractions", old_name="gcd", new_module="math"),
-            # sys.getcheckinterval/setcheckinterval removed in 3.9
-            ChangeImport(old_module="sys", old_name="getcheckinterval", new_module="sys", new_name="getswitchinterval"),
-            ChangeImport(old_module="sys", old_name="setcheckinterval", new_module="sys", new_name="setswitchinterval"),
-            # Thread.isAlive() removed in 3.9
-            ReplaceThreadIsAlive(),
-            # HTMLParser.unescape() -> html.unescape() (removed in 3.9)
-            ReplaceHtmlParserUnescape(),
-            # Update project metadata, packaging, Dockerfiles, CloudFormation templates, and .whitesource files to the target version
-            RpcRecipe("org.openrewrite.python.migrate.UpgradePythonVersionTo39"),
-        ]

openrewrite_migrate_python-0.10.0.dev20260714174242/tests/test_typing_callable.py

@@ -1,34 +0,0 @@
-"""Tests for typing.Callable migration recipe."""
-
-from rewrite.test import RecipeSpec, python
-from openrewrite_migrate_python.migrate.typing_callable import (
-    ReplaceTypingCallableWithCollectionsAbcCallable,
-)
-
-
-class TestReplaceTypingCallableWithCollectionsAbcCallable:
-    def test_replaces_from_typing_import_callable(self):
-        spec = RecipeSpec(recipe=ReplaceTypingCallableWithCollectionsAbcCallable())
-        spec.rewrite_run(
-            python(
-                """
-                from typing import Callable
-                handler: Callable[[int], str] = lambda x: str(x)
-                """,
-                """
-                from collections.abc import Callable
-                handler: Callable[[int], str] = lambda x: str(x)
-                """,
-            )
-        )
-
-    def test_no_change_when_collections_abc_callable(self):
-        spec = RecipeSpec(recipe=ReplaceTypingCallableWithCollectionsAbcCallable())
-        spec.rewrite_run(
-            python(
-                """
-                from collections.abc import Callable
-                handler: Callable[[int], str] = lambda x: str(x)
-                """
-            )
-        )