Patchwork D12206: heptapod-ci: remove Python 2 support

login
register
mail settings
Submitter phabricator
Date Feb. 21, 2022, 11:07 a.m.
Message ID <differential-rev-PHID-DREV-cjmhm4putmvasyyaipv4-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/50543/
State New
Headers show

Comments

phabricator - Feb. 21, 2022, 11:07 a.m.
Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  (hurray!) 6.1 was the last release to support Python 2, let's lighten
  the CI.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D12206

AFFECTED FILES
  contrib/heptapod-ci.yml

CHANGE DETAILS




To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/contrib/heptapod-ci.yml b/contrib/heptapod-ci.yml
--- a/contrib/heptapod-ci.yml
+++ b/contrib/heptapod-ci.yml
@@ -30,24 +30,12 @@ 
         - 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
-    stage: tests
-    script:
-        - echo "python used, $PYTHON"
-        - make rust-tests
-
 rust-cargo-test-py3:
     stage: tests
     <<: *rust_cargo_test
@@ -72,13 +60,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 +68,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 +75,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 +91,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: