Skip to content

Commit 5b3dfa1

Browse files
msimacekmsimacek
committed
[GR-21590] Update imports
PullRequest: graalpython/2035
2 parents 2e733b4 + b552675 commit 5b3dfa1

File tree

9 files changed

+411
-13
lines changed

9 files changed

+411
-13
lines changed

‎ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "a8d5bf4712e204ee36470373aa7967a79f30ad81" }
1+
{ "overlay": "636dfe647a5695b226500dd04f42819723ae1a33" }

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_large_PYTHONPATH
88
*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_non_ascii
99
*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_output_newline
10+
*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_run_code
11+
*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_run_module
1012
*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_run_module_bug1764407
1113
*graalpython.lib-python.3.test.test_cmd_line.CmdLineTest.test_stdin_readline
1214
*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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
*graalpython.lib-python.3.test.test_codecs.ExceptionChainingTest.test_multiple_args_is_not_wrapped
4040
*graalpython.lib-python.3.test.test_codecs.ExceptionChainingTest.test_new_override_is_not_wrapped
4141
*graalpython.lib-python.3.test.test_codecs.ExceptionChainingTest.test_non_str_arg_is_not_wrapped
42+
*graalpython.lib-python.3.test.test_codecs.ExceptionChainingTest.test_unflagged_non_text_codec_handling
4243
*graalpython.lib-python.3.test.test_codecs.IDNACodecTest.test_errors
4344
*graalpython.lib-python.3.test.test_codecs.IDNACodecTest.test_stream
4445
*graalpython.lib-python.3.test.test_codecs.Latin1Test.test_decode

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@
3131
*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_invalid_arg_produces_message
3232
*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_legacy_paths
3333
*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_multiple_runs
34+
*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_no_args_compiles_path
3435
*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_no_args_respects_force_flag
3536
*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_no_args_respects_quiet_flag
3637
*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_pep3147_paths_normal
3738
*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_pyc_invalidation_mode
3839
*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_quiet
3940
*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_recursion_control
41+
*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_regexp
4042
*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_silent
4143
*graalpython.lib-python.3.test.test_compileall.CommmandLineTestsWithSourceEpoch.test_workers_available_cores
4244
*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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
*graalpython.lib-python.3.test.test_httplib.HTTPSTest.test_host_port
6969
*graalpython.lib-python.3.test.test_httplib.HTTPSTest.test_local_bad_hostname
7070
*graalpython.lib-python.3.test.test_httplib.HTTPSTest.test_local_good_hostname
71+
*graalpython.lib-python.3.test.test_httplib.HTTPSTest.test_local_unknown_cert
7172
*graalpython.lib-python.3.test.test_httplib.HTTPSTest.test_networked
7273
*graalpython.lib-python.3.test.test_httplib.HTTPSTest.test_networked_bad_cert
7374
*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

Lines changed: 386 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
*graalpython.lib-python.3.test.test_quopri.QuopriTestCase.test_encode_header
88
*graalpython.lib-python.3.test.test_quopri.QuopriTestCase.test_encodestring
99
*graalpython.lib-python.3.test.test_quopri.QuopriTestCase.test_idempotent_string
10+
*graalpython.lib-python.3.test.test_quopri.QuopriTestCase.test_scriptdecode
11+
*graalpython.lib-python.3.test.test_quopri.QuopriTestCase.test_scriptencode

‎mx.graalpython/mx_graalpython_bisect.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ def _bisect_benchmark(argv, bisect_id, email_to):
185185
args.benchmark_command = sec['benchmark_command']
186186
args.benchmark_criterion = sec.get('benchmark_criterion', 'BEST')
187187
args.enterprise = sec.getboolean('enterprise', False)
188+
args.no_clean = sec.getboolean('no_clean', False)
188189
else:
189190
parser = argparse.ArgumentParser()
190191
parser.add_argument('bad', help="Bad commit for bisection")
@@ -195,6 +196,7 @@ def _bisect_benchmark(argv, bisect_id, email_to):
195196
parser.add_argument('--benchmark-criterion', default='BEST',
196197
help="Which result parameter should be used for comparisons")
197198
parser.add_argument('--enterprise', action='store_true', help="Whether to checkout graal-enterprise")
199+
parser.add_argument('--no-clean', action='store_true', help="Do not run 'mx clean' between runs")
198200
args = parser.parse_args(argv)
199201

200202
primary_suite = mx.primary_suite()
@@ -221,14 +223,20 @@ def benchmark_callback(suite, commit):
221223
if args.enterprise:
222224
debug_str += " graal-enterprise={}".format(get_commit(get_suite('/vm-enterprise')))
223225
print(debug_str)
224-
env = os.environ.copy()
225-
env['MX_ALT_OUTPUT_ROOT'] = 'mxbuild-{}'.format(commit)
226-
retcode = mx.run(shlex.split(args.build_command), env=env, nonZeroIsFatal=False)
226+
build_command = shlex.split(args.build_command)
227+
if not args.no_clean:
228+
try:
229+
clean_command = build_command[:build_command.index('build')] + ['clean']
230+
retcode = mx.run(clean_command, nonZeroIsFatal=False)
231+
if retcode:
232+
print("Warning: clean command failed")
233+
except ValueError:
234+
pass
235+
retcode = mx.run(build_command, nonZeroIsFatal=False)
227236
if retcode:
228237
raise RuntimeError("Failed to execute the build command for {}".format(commit))
229238
output = mx.OutputCapture()
230-
retcode = mx.run(shlex.split(args.benchmark_command), env=env, out=mx.TeeOutputCapture(output),
231-
nonZeroIsFatal=False)
239+
retcode = mx.run(shlex.split(args.benchmark_command), out=mx.TeeOutputCapture(output), nonZeroIsFatal=False)
232240
if retcode:
233241
raise RuntimeError("Failed to execute benchmark for {}".format(commit))
234242
match = re.search(r'{}.*duration: ([\d.]+)'.format(re.escape(args.benchmark_criterion)), output.data)
@@ -247,10 +255,6 @@ def benchmark_callback(suite, commit):
247255
print()
248256
print(summary)
249257

250-
if 'CI' not in os.environ:
251-
print("You can rerun a benchmark for a particular commit using:\nMX_ALT_OUTPUT_ROOT=mxbuild-$commit {}".format(
252-
args.benchmark_command))
253-
254258
send_email(
255259
bisect_id,
256260
email_to,

‎mx.graalpython/suite.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,23 @@
4444
},
4545
{
4646
"name": "tools",
47-
"version": "e9bddb1c7bd93b0435e08199f21cf7d1d04b497e",
47+
"version": "d5c604c2c94f74f397d1cd62595d541048ae6289",
4848
"subdir": True,
4949
"urls": [
5050
{"url": "https://github.com/oracle/graal", "kind": "git"},
5151
],
5252
},
5353
{
5454
"name": "sulong",
55-
"version": "e9bddb1c7bd93b0435e08199f21cf7d1d04b497e",
55+
"version": "d5c604c2c94f74f397d1cd62595d541048ae6289",
5656
"subdir": True,
5757
"urls": [
5858
{"url": "https://github.com/oracle/graal", "kind": "git"},
5959
]
6060
},
6161
{
6262
"name": "regex",
63-
"version": "e9bddb1c7bd93b0435e08199f21cf7d1d04b497e",
63+
"version": "d5c604c2c94f74f397d1cd62595d541048ae6289",
6464
"subdir": True,
6565
"urls": [
6666
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)