[GR-21590] update imports.

PullRequest: graalpython/3101

Author: cosminbasca

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "d468353ccaa8044ff95a18897cc31aca23e97dae" }
+{ "overlay": "2e337945a8f38c10254b2e026bf1ede34b0271f6" }

mx.graalpython/mx_graalpython.py

@@ -1124,6 +1124,9 @@ def run_python_unittests(python_binary, args=None, paths=None, aot_compatible=Fa
     env['PYTHONHASHSEED'] = '0'
     delete_bad_env_keys(env)
 
+    if mx.primary_suite() != SUITE:
+        env.setdefault("GRAALPYTEST_ALLOW_NO_JAVA_ASSERTIONS", "true")
+
     # list of excluded tests
     if aot_compatible:
         exclude += AOT_INCOMPATIBLE_TESTS
@@ -1938,7 +1941,7 @@ def update_import_cmd(args):
     overlaytip = str(vc.tip(overlaydir)).strip()
 
     # update ci import in all our repos, commit the full update
-    prev_verbosity = mx._opts.very_verbose
+    prev_verbosity = mx.get_opts().very_verbose
     for repo in repos:
         jsonnetfile = os.path.join(repo, "ci.jsonnet")
         with open(jsonnetfile, "w") as f:
@@ -1951,10 +1954,10 @@ def update_import_cmd(args):
     if not args.no_push:
         for repo in repos_updated:
             try:
-                mx._opts.very_verbose = True
+                mx.get_opts().very_verbose = True
                 vc.git_command(repo, ["push", "-u", "origin", "HEAD:%s" % current_branch], abortOnError=True)
             finally:
-                mx._opts.very_verbose = prev_verbosity
+                mx.get_opts().very_verbose = prev_verbosity
 
     if repos_updated:
         mx.log("\n  ".join(["These repos were updated:"] + repos_updated))

mx.graalpython/suite.py

@@ -45,31 +45,31 @@
             },
             {
                 "name": "sdk",
-                "version": "8ae5773fb6fa23ebe1e3bf9e43d2cd32da10f7e3",
+                "version": "f60f913bcbca61a4e8894eb89307d0ba0db48a16",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "tools",
-                "version": "8ae5773fb6fa23ebe1e3bf9e43d2cd32da10f7e3",
+                "version": "f60f913bcbca61a4e8894eb89307d0ba0db48a16",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "8ae5773fb6fa23ebe1e3bf9e43d2cd32da10f7e3",
+                "version": "f60f913bcbca61a4e8894eb89307d0ba0db48a16",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "8ae5773fb6fa23ebe1e3bf9e43d2cd32da10f7e3",
+                "version": "f60f913bcbca61a4e8894eb89307d0ba0db48a16",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},