Fix manylinux wheel matching for PEP 425 sorted platform tags (#1401)

monkut · storkwrangler · web-flow · commit a675cc08cbe3 · 2025-12-09T22:31:34.000+09:00
The manylinux wheel regex pattern failed to match wheels using the properly sorted compressed platform tag format specified by PEP 425. PEP 425 requires compressed platform tags to be sorted alphabetically, which places legacy tags (manylinux2014) before PEP 600 tags (manylinux_2_17) since '2' < '_' in ASCII. Some packages like psycopg-binary have adopted this format in recent releases, causing get_cached_manylinux_wheel() to return None for valid wheels. Update build_manylinux_wheel_file_match_pattern() to support: - Sorted format: manylinux2014_x86_64.manylinux_2_17_x86_64 (PEP 425) - Unsorted format: manylinux_2_17_x86_64.manylinux2014_x86_64 (legacy) - Legacy only: manylinux2014_x86_64 Add test_get_manylinux_python314() and test_manylinux_wheel_platform_tag_sort_order() to verify the fix. Github-Issue:#1400 Co-authored-by: shane <shane.cousins@kiconiaworks.com>
diff --git a/tests/test_core.py b/tests/test_core.py
@@ -235,6 +235,56 @@ def test_get_manylinux_python313(self):
             self.assertTrue(os.path.isfile(path))
             os.remove(path)
 
+    def test_get_manylinux_python314(self):
+        z = Zappa(runtime="python3.14")
+        self.assertIsNotNone(z.get_cached_manylinux_wheel("psycopg-binary", "3.3.1"))
+        self.assertIsNone(z.get_cached_manylinux_wheel("derp_no_such_thing", "0.0"))
+
+        # mock with a known manylinux wheel package so that code for downloading them gets invoked
+        mock_installed_packages = {"psycopg-binary": "3.3.1"}
+        with mock.patch(
+            "zappa.core.Zappa.get_installed_packages",
+            return_value=mock_installed_packages,
+        ):
+            z = Zappa(runtime="python3.14")
+            path = z.create_lambda_zip(handler_file=os.path.realpath(__file__))
+            self.assertTrue(os.path.isfile(path))
+            os.remove(path)
+
+        # same, but with an ABI3 package
+        mock_installed_packages = {"cryptography": "46.0.3"}
+        with mock.patch(
+            "zappa.core.Zappa.get_installed_packages",
+            return_value=mock_installed_packages,
+        ):
+            z = Zappa(runtime="python3.14")
+            path = z.create_lambda_zip(handler_file=os.path.realpath(__file__))
+            self.assertTrue(os.path.isfile(path))
+            os.remove(path)
+
+    def test_manylinux_wheel_platform_tag_sort_order(self):
+        """Test that wheel filename matching supports both sorted and unsorted platform tag orders.
+
+        Per PEP 425, compressed platform tags should be dot-separated and sorted.
+        Alphabetically sorted order puts legacy tags (manylinux2014) before PEP 600
+        tags (manylinux_2_17). We support both orderings for compatibility.
+        """
+        from zappa.core import build_manylinux_wheel_file_match_pattern
+
+        pattern = build_manylinux_wheel_file_match_pattern("python3.13", "x86_64")
+
+        # Sorted format (legacy first) - per PEP 425
+        sorted_filename = "psycopg_binary-3.3.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl"
+        self.assertIsNotNone(pattern.match(sorted_filename))
+
+        # Unsorted format (PEP 600 first) - for backwards compatibility
+        unsorted_filename = "psycopg_binary-3.2.5-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"
+        self.assertIsNotNone(pattern.match(unsorted_filename))
+
+        # Legacy only format
+        legacy_only_filename = "somepackage-1.0.0-cp313-cp313-manylinux2014_x86_64.whl"
+        self.assertIsNotNone(pattern.match(legacy_only_filename))
+
     def test_verify_downloaded_manylinux_wheel(self):
         z = Zappa(runtime="python3.10")
         cached_wheels_dir = Path(tempfile.gettempdir()) / "cached_wheels"
diff --git a/zappa/core.py b/zappa/core.py
@@ -170,9 +170,17 @@ def build_manylinux_wheel_file_match_pattern(runtime: str, architecture: str) ->
     else:
         raise ValueError(f"Invalid 'architecture', must be one of {VALID_ARCHITECTURES}, got: {architecture}")
 
+    # Support compressed platform tags per PEP 425 (dot-separated, sorted).
+    # Properly sorted order puts legacy tags (manylinux2014) before PEP 600 tags (manylinux_2_17)
+    # alphabetically. We also support the reverse order for backwards compatibility.
+    # Examples:
+    #   - manylinux2014_x86_64.whl (legacy only)
+    #   - manylinux2014_x86_64.manylinux_2_17_x86_64.whl (sorted: legacy first)
+    #   - manylinux_2_17_x86_64.manylinux2014_x86_64.whl (unsorted: PEP 600 first)
+    legacy_tag = rf'({"|".join(manylinux_legacy_tags)})_({"|".join(valid_platform_tags)})'
+    pep600_tag = rf'manylinux_\d+_\d+_({"|".join(valid_platform_tags)})'
     manylinux_wheel_file_match = (
-        rf'^.*{python_tag}-(manylinux_\d+_\d+_({"|".join(valid_platform_tags)})[.])?'
-        rf'({"|".join(manylinux_legacy_tags)})_({"|".join(valid_platform_tags)})[.]whl$'
+        rf"^.*{python_tag}-{python_tag}-" rf"({legacy_tag}[.]{pep600_tag}|{pep600_tag}[.]{legacy_tag}|{legacy_tag})[.]whl$"
     )
 
     # The 'abi3' tag is a compiled distribution format designed for compatibility across multiple Python 3 versions.
