[GR-21590] Update Python imports.

PullRequest: graalpython/2703

Author: fangerer

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "589247f5605de748107c2312c924b811145f5fd1" }
+{ "overlay": "d84ef27aabd7b43c3f7f903a45e01e0036bcca71" }

graalpython/lib-graalpython/modules/ginstall.py

@@ -723,7 +723,7 @@ def _install_from_url(url, package, extra_opts=None, add_cflags="", ignore_error
         info("auto-patching {}", extracted_dir)
         autopatch_capi.auto_patch_tree(extracted_dir)
 
-    patch_file_path = first_existing(package, versions, os.path.join(patches_dir, "sdist"), ".patch")
+    patch_file_path = first_existing(package, versions, get_sdist_patch(patches_dir), ".patch")
     if patch_file_path:
         run_cmd(["patch", "-d", extracted_dir, "-p1", "-i", patch_file_path], quiet=quiet)
 
@@ -800,6 +800,10 @@ def read_first_existing(pkg_name, versions, dir, suffix):
 
 # end of code duplicated in pip_hook.py
 
+def get_sdist_patch(patch_dir):
+    sdist = os.path.join(patch_dir, "sdist")
+    return sdist if os.path.isdir(sdist) else patch_dir
+
 
 def install_with_pip(package, msg="", failOnError=False, **kwargs):
     for kw in ['extra_opts', 'debug_build']:

mx.graalpython/suite.py

@@ -44,31 +44,31 @@
             },
             {
                 "name": "sdk",
-                "version": "7898bacfc2c8164a1087aa78d7cecc46d9d6f5e8",
+                "version": "e1d6997fce4279ffab3b48d53f680d9e6b19d26a",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "tools",
-                "version": "7898bacfc2c8164a1087aa78d7cecc46d9d6f5e8",
+                "version": "e1d6997fce4279ffab3b48d53f680d9e6b19d26a",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "7898bacfc2c8164a1087aa78d7cecc46d9d6f5e8",
+                "version": "e1d6997fce4279ffab3b48d53f680d9e6b19d26a",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "7898bacfc2c8164a1087aa78d7cecc46d9d6f5e8",
+                "version": "e1d6997fce4279ffab3b48d53f680d9e6b19d26a",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},