# HG changeset patch # User Raphaël Gomès # Date 1645441437 -3600 # Node ID f835f6a4ee9a7f232daef1b94bdabb201f6d5be8 # Parent 61c27ac5a1c5239d8539b71ef0a60490463d1703 heptapod-ci: remove Python 2 support (hurray!) 6.1 was the last release to support Python 2, let's lighten the CI. Differential Revision: https://phab.mercurial-scm.org/D12206 diff -r 61c27ac5a1c5 -r f835f6a4ee9a contrib/heptapod-ci.yml --- a/contrib/heptapod-ci.yml Fri Feb 18 12:58:44 2022 +0100 +++ b/contrib/heptapod-ci.yml Mon Feb 21 12:03:57 2022 +0100 @@ -30,27 +30,17 @@ - echo "$RUNTEST_ARGS" - HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS -checks-py2: - <<: *runtests - variables: - RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt" - checks-py3: <<: *runtests variables: RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt" PYTHON: python3 -rust-cargo-test-py2: &rust_cargo_test - <<: *all +rust-cargo-test-py3: stage: tests script: - echo "python used, $PYTHON" - make rust-tests - -rust-cargo-test-py3: - stage: tests - <<: *rust_cargo_test variables: PYTHON: python3 @@ -72,13 +62,6 @@ ./contrib/phab-refresh-stack.sh --comment "$DEFAULT_COMMENT"; fi -test-py2: - <<: *runtests - variables: - RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt" - TEST_HGMODULEPOLICY: "c" - TEST_HGTESTS_ALLOW_NETIO: "1" - test-py3: <<: *runtests variables: @@ -87,12 +70,6 @@ TEST_HGMODULEPOLICY: "c" TEST_HGTESTS_ALLOW_NETIO: "1" -test-py2-pure: - <<: *runtests - variables: - RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt" - TEST_HGMODULEPOLICY: "py" - test-py3-pure: <<: *runtests variables: @@ -100,13 +77,6 @@ PYTHON: python3 TEST_HGMODULEPOLICY: "py" -test-py2-rust: - <<: *runtests - variables: - HGWITHRUSTEXT: cpython - RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt" - TEST_HGMODULEPOLICY: "rust+c" - test-py3-rust: <<: *runtests variables: @@ -123,12 +93,6 @@ PYTHON: python3 TEST_HGMODULEPOLICY: "rust+c" -test-py2-chg: - <<: *runtests - variables: - RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg" - TEST_HGMODULEPOLICY: "c" - test-py3-chg: <<: *runtests variables: