[GR-21590] Update imports.

PullRequest: graalpython/3808

Author: timfel

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "a74e2e4ae250150f0f974c20c80ac212a9116ea1" }
+{ "overlay": "86a4d3d85b6a6a4778257dc9746356a5a5d36608" }

graalpython/com.oracle.graal.python.cext/include/cpython/tupleobject.h

@@ -41,7 +41,12 @@ PyAPI_FUNC(PyObject **) PyTruffleTuple_GetItems(PyObject *op);
 
 // GraalPy change: Export PyTuple_SET_ITEM as regular API function to use in PyO3 and others
 PyAPI_FUNC(void) PyTuple_SET_ITEM(PyObject*, Py_ssize_t, PyObject*);
+
+/* Inline function to be used in the PyTuple_SET_ITEM macro. */
+static inline void graalpy_tuple_set_item(PyObject *op, Py_ssize_t index, PyObject *value) {
+    PyTruffleTuple_GetItems(op)[index] = value;
+}
 #define PyTuple_SET_ITEM(op, index, value) \
-    PyTuple_SET_ITEM(_PyObject_CAST(op), (index), _PyObject_CAST(value))
+    graalpy_tuple_set_item(_PyObject_CAST(op), (index), _PyObject_CAST(value))
 
 PyAPI_FUNC(void) _PyTuple_DebugMallocStats(FILE *out);

graalpython/com.oracle.graal.python.cext/src/tupleobject.c

@@ -1444,5 +1444,5 @@ _PyTuple_GET_ITEM(PyObject* a, Py_ssize_t b) {
 #undef PyTuple_SET_ITEM
 // Export PyTuple_SET_ITEM as regular API function to use in PyO3 and others
 void PyTuple_SET_ITEM(PyObject* op, Py_ssize_t index, PyObject* value) {
-    PyTruffleTuple_GetItems(op)[index] = value;
+    graalpy_tuple_set_item(op, index, value);
 }

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_tarfile.txt

@@ -126,7 +126,7 @@ test.test_threading.SemaphoreTests.test_try_acquire_contended @ darwin-arm64,dar
 test.test_threading.SemaphoreTests.test_with @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 # Can transiently fail with java.lang.AssertionError: The TruffleContext must be entered
 !test.test_threading.ThreadJoinOnShutdown.test_1_join_on_shutdown @ darwin-arm64,linux-aarch64,linux-x86_64
-test.test_threading.ThreadJoinOnShutdown.test_4_daemon_threads @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
+test.test_threading.ThreadJoinOnShutdown.test_4_daemon_threads @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_threading.ThreadTests.test_BoundedSemaphore_limit @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_threading.ThreadTests.test_args_argument @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
 test.test_threading.ThreadTests.test_boolean_target @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_threading.txt

@@ -1864,7 +1864,8 @@ def update_import_cmd(args):
         join(overlaydir, "python", "graal", "ci"),
         dirs_exist_ok=True)
 
-    run_mx(['--dynamicimports', '/graal-enterprise', 'checkout-downstream', 'compiler', 'graal-enterprise'])
+    if not args.no_pull:
+        run_mx(['--dynamicimports', '/graal-enterprise', 'checkout-downstream', 'compiler', 'graal-enterprise'])
     enterprisedir = join(SUITE.dir, "..", "graal-enterprise")
     shutil.copy(
         join(enterprisedir, "common.json"),

mx.graalpython/mx_graalpython.py

@@ -627,7 +627,7 @@ def _vmRun(self, vm, workdir, command, benchmarks, bmSuiteArgs):
             mx.run(["git", "config", "user.email", "you@example.com"], cwd=npdir)
             mx.run(["git", "config", "user.name", "YourName"], cwd=npdir)
             mx.run(["git", "commit", "--allow-empty", "-m", "init"], cwd=npdir)
-            mx.run(["git", "branch", self.VERSION], cwd=npdir)
+            mx.run(["git", "branch", f"v{self.VERSION}"], cwd=npdir)
             mx.run(["git", "branch", "main"], cwd=npdir, nonZeroIsFatal=False)
             mx.run(["git", "branch", "master"], cwd=npdir, nonZeroIsFatal=False)
 

mx.graalpython/mx_graalpython_python_benchmarks.py

@@ -1,5 +1,7 @@
 {
     "extraPaths": [
-        "../../mx/src/"
+        "../../mx/src/",
+        "../../graal/truffle/mx.truffle/",
+        "../../graal/sdk/mx.sdk/",
     ]
 }

mx.graalpython/pyrightconfig.json

@@ -53,15 +53,15 @@
             },
             {
                 "name": "tools",
-                "version": "69f10d3d658a6aeca3d5ce59c64af6a18336f14c",
+                "version": "64d1fc89abceee55319a919d523830657e7bc280",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "regex",
-                "version": "69f10d3d658a6aeca3d5ce59c64af6a18336f14c",
+                "version": "64d1fc89abceee55319a919d523830657e7bc280",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},

mx.graalpython/suite.py

@@ -38,5 +38,5 @@
 # SOFTWARE.
 
 if [ -n "$GITHUB_RUN_ID" ]; then
-    dnf install -y libgeos-devel
+    dnf install -y geos-devel
 fi