Skip to content

Commit f2627f3

Browse files
committed
[GR-22580] mx requires Python 3.8 now
PullRequest: truffleruby/3327
2 parents 1cc58d6 + f6b2701 commit f2627f3

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

ci.jsonnet

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ local part_definitions = {
3838
path+:: [],
3939
TRUFFLERUBY_CI: "true",
4040
RUBY_BENCHMARKS: "true",
41-
MX_PYTHON_VERSION: "3",
41+
MX_PYTHON: "python3.8",
4242
TRUFFLE_STRICT_OPTION_DEPRECATION: "true",
4343
PATH: std.join(":", self.path + ["$PATH"]),
4444
},
4545

4646
packages+: {
47+
mx: "HEAD",
48+
python3: "==3.8.10", # For mx
4749
"pip:ninja_syntax": "==1.7.2", # Required by NFI and mx
4850
},
4951

@@ -329,7 +331,7 @@ local part_definitions = {
329331
environment+: common.downloads.eclipse.environment,
330332
mx_build_options:: ["--jdt", "builtin", "--warning-as-error", "--force-deprecation-as-warning"],
331333
packages+: {
332-
"pip:pylint": "==1.9.0",
334+
"pip:pylint": "==2.4.4",
333335
"shellcheck": "==0.6.0",
334336
},
335337
run+: jt(["lint"]) + jt(["spotbugs"]),
@@ -733,7 +735,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
733735
};
734736

735737
{
736-
specVersion: "2",
738+
specVersion: "3",
737739
overlay: overlay,
738740
builds: composition_environment.builds,
739741
}

mx.truffleruby/mx_truffleruby_benchmark.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ def __init__(self, args):
3838
self.args = args
3939

4040
def __enter__(self):
41-
preexec_fn, creationflags = mx._get_new_progress_group_args()
4241
if mx._opts.verbose:
4342
mx.log(' '.join(['(background)'] + [pipes.quote(arg) for arg in self.args]))
44-
self.process = subprocess.Popen(self.args, preexec_fn=preexec_fn, creationflags=creationflags)
43+
self.process = subprocess.Popen(self.args, start_new_session=True)
4544
mx._addSubprocess(self.process, self.args)
4645

4746
def __exit__(self, exc_type, value, traceback):

0 commit comments

Comments
 (0)