Merge pull request #178 from jfuss/allow-newer-manylinux-versions

feat(python): Support downloading manylinux2010 and manylinux2014

Author: sriram-mv

aws_lambda_builders/workflows/python_pip/packager.py

@@ -150,7 +150,13 @@ class DependencyBuilder(object):
     packager.
     """
 
-    _MANYLINUX_COMPATIBLE_PLATFORM = {"any", "linux_x86_64", "manylinux1_x86_64"}
+    _MANYLINUX_COMPATIBLE_PLATFORM = {
+        "any",
+        "linux_x86_64",
+        "manylinux1_x86_64",
+        "manylinux2010_x86_64",
+        "manylinux2014_x86_64",
+    }
     _COMPATIBLE_PACKAGE_WHITELIST = {"sqlalchemy"}
 
     def __init__(self, osutils, runtime, pip_runner=None):
@@ -243,7 +249,6 @@ def _download_dependencies(self, directory, requirements_filename):
                     compatible_wheels.add(package)
                 else:
                     incompatible_wheels.add(package)
-
         LOG.debug("initial compatible: %s", compatible_wheels)
         LOG.debug("initial incompatible: %s", incompatible_wheels | sdists)
 
@@ -622,7 +627,7 @@ def download_manylinux_wheels(self, packages, directory, lambda_abi):
                 "--only-binary=:all:",
                 "--no-deps",
                 "--platform",
-                "manylinux1_x86_64",
+                "manylinux2014_x86_64",
                 "--implementation",
                 "cp",
                 "--abi",

tests/functional/workflows/python_pip/test_packager.py

@@ -555,7 +555,7 @@ def test_can_replace_incompat_whl(self, tmpdir, osutils, pip_runner):
                 "--only-binary=:all:",
                 "--no-deps",
                 "--platform",
-                "manylinux1_x86_64",
+                "manylinux2014_x86_64",
                 "--implementation",
                 "cp",
                 "--abi",
@@ -589,7 +589,7 @@ def test_whitelist_sqlalchemy(self, tmpdir, osutils, pip_runner):
                 "--only-binary=:all:",
                 "--no-deps",
                 "--platform",
-                "manylinux1_x86_64",
+                "manylinux2014_x86_64",
                 "--implementation",
                 "cp",
                 "--abi",
@@ -721,7 +721,7 @@ def test_build_into_existing_dir_with_preinstalled_packages(self, tmpdir, osutil
                 "--only-binary=:all:",
                 "--no-deps",
                 "--platform",
-                "manylinux1_x86_64",
+                "manylinux2014_x86_64",
                 "--implementation",
                 "cp",
                 "--abi",

tests/integration/workflows/custom_make/test_custom_make.py

@@ -46,7 +46,7 @@ def test_must_build_python_project_through_makefile(self):
             "idna",
             "urllib3-1.25.9.dist-info",
             "chardet-3.0.4.dist-info",
-            "certifi-2020.4.5.1.dist-info",
+            "certifi-2020.4.5.2.dist-info",
             "certifi",
             "idna-2.9.dist-info",
             "requests",

tests/integration/workflows/custom_make/testdata/makefile-root/requirements-requests.txt

@@ -1 +1,4 @@
-requests==2.23.0
+requests==2.23.0
+
+# Pinning so the test can expect a given version
+certifi==2020.4.5.2 # dep of requests

tests/unit/workflows/python_pip/test_packager.py

@@ -234,7 +234,7 @@ def test_download_wheels(self, pip_factory):
             "--only-binary=:all:",
             "--no-deps",
             "--platform",
-            "manylinux1_x86_64",
+            "manylinux2014_x86_64",
             "--implementation",
             "cp",
             "--abi",