From c7eccdaaee3cb5921d3d4cdb8dcb2639d4e7dec8 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Fri, 17 Mar 2023 10:39:40 -0500 Subject: Use python3.11 in CI to make sure toml is validated This also fixes a regression from https://github.com/rust-lang/rust/pull/106085 which stopped testing that we support python2 in PR CI. --- src/bootstrap/bootstrap_test.py | 3 +-- src/bootstrap/configure.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/bootstrap') diff --git a/src/bootstrap/bootstrap_test.py b/src/bootstrap/bootstrap_test.py index 6a4a64a1ed5..20bd71f06e9 100644 --- a/src/bootstrap/bootstrap_test.py +++ b/src/bootstrap/bootstrap_test.py @@ -91,8 +91,7 @@ class GenerateAndParseConfig(unittest.TestCase): # Verify this is actually valid TOML. tomllib.loads(build.config_toml) except ImportError: - # too old a version of python - pass + print("warning: skipping TOML validation, need at least python 3.11", file=sys.stderr) return build def test_no_args(self): diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py index dc2271bdf27..abd28b4005d 100755 --- a/src/bootstrap/configure.py +++ b/src/bootstrap/configure.py @@ -251,7 +251,7 @@ def parse_args(args): if not found: unknown_args.append(arg) - + # Note: here and a few other places, we use [-1] to apply the *last* value # passed. But if option-checking is enabled, then the known_args loop will # also assert that options are only passed once. -- cgit 1.4.1-3-g733a5