File tree 4 files changed +7
-7
lines changed
4 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -91,8 +91,7 @@ def serialize_and_parse(self, args):
91
91
# Verify this is actually valid TOML.
92
92
tomllib .loads (build .config_toml )
93
93
except ImportError :
94
- # too old a version of python
95
- pass
94
+ print ("warning: skipping TOML validation, need at least python 3.11" , file = sys .stderr )
96
95
return build
97
96
98
97
def test_no_args (self ):
Original file line number Diff line number Diff line change @@ -251,7 +251,7 @@ def parse_args(args):
251
251
252
252
if not found :
253
253
unknown_args .append (arg )
254
-
254
+
255
255
# Note: here and a few other places, we use [-1] to apply the *last* value
256
256
# passed. But if option-checking is enabled, then the known_args loop will
257
257
# also assert that options are only passed once.
Original file line number Diff line number Diff line change 1
1
FROM ubuntu:22.04
2
2
3
3
ARG DEBIAN_FRONTEND=noninteractive
4
+ # NOTE: intentionally uses python2 for x.py so we can test it still works.
5
+ # validate-toolstate only runs in our CI, so it's ok for it to only support python3.
4
6
RUN apt-get update && apt-get install -y --no-install-recommends \
5
7
g++ \
6
8
make \
7
9
ninja-build \
8
10
file \
9
11
curl \
10
12
ca-certificates \
13
+ python2.7 \
11
14
python3 \
12
15
python3-pip \
13
16
python3-pkg-resources \
@@ -30,4 +33,4 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
30
33
COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
31
34
COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/
32
35
33
- ENV SCRIPT python3 ../x.py test --stage 0 src/tools/tidy tidyselftest
36
+ ENV SCRIPT python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest
Original file line number Diff line number Diff line change @@ -2,7 +2,6 @@ FROM ubuntu:22.04
2
2
3
3
ARG DEBIAN_FRONTEND=noninteractive
4
4
5
- # NOTE: intentionally installs both python2 and python3 so we can test support for both.
6
5
RUN apt-get update && apt-get install -y --no-install-recommends \
7
6
g++ \
8
7
gcc-multilib \
@@ -11,8 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
11
10
file \
12
11
curl \
13
12
ca-certificates \
14
- python2.7 \
15
- python3 \
13
+ python3.11 \
16
14
git \
17
15
cmake \
18
16
sudo \
You can’t perform that action at this time.
0 commit comments