[GR-21590] Update imports

PullRequest: graalpython/2035

Author: msimacek

ci.jsonnet

@@ -1 +1 @@
-{ "overlay": "a8d5bf4712e204ee36470373aa7967a79f30ad81" }
+{ "overlay": "636dfe647a5695b226500dd04f42819723ae1a33" }

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

@@ -7,6 +7,8 @@
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_large_PYTHONPATH
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_non_ascii
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_output_newline
+*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_run_code
+*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_run_module
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_run_module_bug1764407
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_stdin_readline
 *graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_unbuffered_input

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

@@ -39,6 +39,7 @@
 *graalpython.lib-python.3.test.test_codecs.ExceptionChainingTest.test_multiple_args_is_not_wrapped
 *graalpython.lib-python.3.test.test_codecs.ExceptionChainingTest.test_new_override_is_not_wrapped
 *graalpython.lib-python.3.test.test_codecs.ExceptionChainingTest.test_non_str_arg_is_not_wrapped
+*graalpython.lib-python.3.test.test_codecs.ExceptionChainingTest.test_unflagged_non_text_codec_handling
 *graalpython.lib-python.3.test.test_codecs.IDNACodecTest.test_errors
 *graalpython.lib-python.3.test.test_codecs.IDNACodecTest.test_stream
 *graalpython.lib-python.3.test.test_codecs.Latin1Test.test_decode

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

@@ -31,12 +31,14 @@
 *graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_invalid_arg_produces_message
 *graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_legacy_paths
 *graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_multiple_runs
+*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_no_args_compiles_path
 *graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_no_args_respects_force_flag
 *graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_no_args_respects_quiet_flag
 *graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_pep3147_paths_normal
 *graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_pyc_invalidation_mode
 *graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_quiet
 *graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_recursion_control
+*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_regexp
 *graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_silent
 *graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_workers_available_cores
 *graalpython.lib-python.3.test.test_compileall.CompileallTestsWithSourceEpoch.test_compile_dir_pathlike

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

@@ -68,6 +68,7 @@
 *graalpython.lib-python.3.test.test_httplib.HTTPSTest.test_host_port
 *graalpython.lib-python.3.test.test_httplib.HTTPSTest.test_local_bad_hostname
 *graalpython.lib-python.3.test.test_httplib.HTTPSTest.test_local_good_hostname
+*graalpython.lib-python.3.test.test_httplib.HTTPSTest.test_local_unknown_cert
 *graalpython.lib-python.3.test.test_httplib.HTTPSTest.test_networked
 *graalpython.lib-python.3.test.test_httplib.HTTPSTest.test_networked_bad_cert
 *graalpython.lib-python.3.test.test_httplib.HTTPSTest.test_networked_good_cert

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

@@ -7,3 +7,5 @@
 *graalpython.lib-python.3.test.test_quopri.QuopriTestCase.test_encode_header
 *graalpython.lib-python.3.test.test_quopri.QuopriTestCase.test_encodestring
 *graalpython.lib-python.3.test.test_quopri.QuopriTestCase.test_idempotent_string
+*graalpython.lib-python.3.test.test_quopri.QuopriTestCase.test_scriptdecode
+*graalpython.lib-python.3.test.test_quopri.QuopriTestCase.test_scriptencode

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

@@ -185,6 +185,7 @@ def _bisect_benchmark(argv, bisect_id, email_to):
         args.benchmark_command = sec['benchmark_command']
         args.benchmark_criterion = sec.get('benchmark_criterion', 'BEST')
         args.enterprise = sec.getboolean('enterprise', False)
+        args.no_clean = sec.getboolean('no_clean', False)
     else:
         parser = argparse.ArgumentParser()
         parser.add_argument('bad', help="Bad commit for bisection")
@@ -195,6 +196,7 @@ def _bisect_benchmark(argv, bisect_id, email_to):
         parser.add_argument('--benchmark-criterion', default='BEST',
                             help="Which result parameter should be used for comparisons")
         parser.add_argument('--enterprise', action='store_true', help="Whether to checkout graal-enterprise")
+        parser.add_argument('--no-clean', action='store_true', help="Do not run 'mx clean' between runs")
         args = parser.parse_args(argv)
 
     primary_suite = mx.primary_suite()
@@ -221,14 +223,20 @@ def benchmark_callback(suite, commit):
         if args.enterprise:
             debug_str += " graal-enterprise={}".format(get_commit(get_suite('/vm-enterprise')))
         print(debug_str)
-        env = os.environ.copy()
-        env['MX_ALT_OUTPUT_ROOT'] = 'mxbuild-{}'.format(commit)
-        retcode = mx.run(shlex.split(args.build_command), env=env, nonZeroIsFatal=False)
+        build_command = shlex.split(args.build_command)
+        if not args.no_clean:
+            try:
+                clean_command = build_command[:build_command.index('build')] + ['clean']
+                retcode = mx.run(clean_command, nonZeroIsFatal=False)
+                if retcode:
+                    print("Warning: clean command failed")
+            except ValueError:
+                pass
+        retcode = mx.run(build_command, nonZeroIsFatal=False)
         if retcode:
             raise RuntimeError("Failed to execute the build command for {}".format(commit))
         output = mx.OutputCapture()
-        retcode = mx.run(shlex.split(args.benchmark_command), env=env, out=mx.TeeOutputCapture(output),
-                         nonZeroIsFatal=False)
+        retcode = mx.run(shlex.split(args.benchmark_command), out=mx.TeeOutputCapture(output), nonZeroIsFatal=False)
         if retcode:
             raise RuntimeError("Failed to execute benchmark for {}".format(commit))
         match = re.search(r'{}.*duration: ([\d.]+)'.format(re.escape(args.benchmark_criterion)), output.data)
@@ -247,10 +255,6 @@ def benchmark_callback(suite, commit):
     print()
     print(summary)
 
-    if 'CI' not in os.environ:
-        print("You can rerun a benchmark for a particular commit using:\nMX_ALT_OUTPUT_ROOT=mxbuild-$commit {}".format(
-            args.benchmark_command))
-
     send_email(
         bisect_id,
         email_to,

mx.graalpython/mx_graalpython_bisect.py

@@ -44,23 +44,23 @@
             },
             {
                 "name": "tools",
-                "version": "e9bddb1c7bd93b0435e08199f21cf7d1d04b497e",
+                "version": "d5c604c2c94f74f397d1cd62595d541048ae6289",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ],
             },
             {
                 "name": "sulong",
-                "version": "e9bddb1c7bd93b0435e08199f21cf7d1d04b497e",
+                "version": "d5c604c2c94f74f397d1cd62595d541048ae6289",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
                 ]
             },
             {
                 "name": "regex",
-                "version": "e9bddb1c7bd93b0435e08199f21cf7d1d04b497e",
+                "version": "d5c604c2c94f74f397d1cd62595d541048ae6289",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},