( )⚙ D11748 ci: stop running with Python 2

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11748

ci: stop running with Python 2
ClosedPublic

Authored by martinvonz on Nov 10 2021, 11:09 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG5d83a40cd3f8: ci: stop running with Python 2
Summary

We're dropping support for Python 2 after hg 6.0.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Nov 10 2021, 11:09 AM
Alphare added a subscriber: Alphare.Nov 10 2021, 11:14 AM

Nothing would make me happier than to queue this. I'll wait for the 6.0 merge.

We still don't have Python 3 packaging for TortoiseHg but I have little hope it's going to be looked at, we've been waiting for a long long time at this point unfortunately. If we can do something about it before the 6.1 release then great.

Alphare accepted this revision.Nov 10 2021, 11:14 AM
This revision is now accepted and ready to land.Nov 10 2021, 11:14 AM
martinvonz added a comment.Nov 10 2021, 11:17 AM

Nothing would make me happier than to queue this. I'll wait for the 6.0 merge.

No problem. I sent this partly just to check if we're allowed to remove py2 stuff yet :)

Just out of curiosity, why wait for 6.0? Because you're hoping for TortoiseHg to get fixed? Or some issue with stable vs. default branches? If this patch were queued on default, would that affect the stable branch? (Again, no rush, I'm just curious.)

Alphare added a comment.Nov 10 2021, 11:21 AM
In D11748#180285, @martinvonz wrote:

Just out of curiosity, why wait for 6.0? Because you're hoping for TortoiseHg to get fixed? Or some issue with stable vs. default branches? If this patch were queued on default, would that affect the stable branch? (Again, no rush, I'm just curious.)

It would only affect default indeed, I'm just still observing the freeze of the (very delayed) 6.0. The last few releases (including patches) have been pretty rough, I think we could use all the help we can take on the Python 3/Windows story.

Again, this patch is actually a relief and I can't wait to not have to think about Python 2 anymore (and to relieve the CI of a good chunk of its variants). :)

martinvonz added a comment.Nov 10 2021, 11:23 AM
In D11748#180286, @Alphare wrote:
In D11748#180285, @martinvonz wrote:

Just out of curiosity, why wait for 6.0? Because you're hoping for TortoiseHg to get fixed? Or some issue with stable vs. default branches? If this patch were queued on default, would that affect the stable branch? (Again, no rush, I'm just curious.)

It would only affect default indeed, I'm just still observing the freeze of the (very delayed) 6.0.

Ah, I didn't know we have a freeze this time.

Alphare added a comment.Nov 10 2021, 11:28 AM
In D11748#180287, @martinvonz wrote:

Ah, I didn't know we have a freeze this time.

The default policy for now is to freeze (since 5.8 I think? I don't remember when that was) because we're changing a lot of stuff around and removing Python 2 + improving Windows at the same. I should probably send a recap to the devel list to make that clearer.

martinvonz added a commit: rHG5d83a40cd3f8: ci: stop running with Python 2.Nov 10 2021, 2:58 PM
Closed by commit rHG5d83a40cd3f8: ci: stop running with Python 2 (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/heptapod-ci.yml (63 lines)

Diff 31051

contrib/heptapod-ci.yml

stages: stages:
- tests - tests
- phabricator - phabricator
image: registry.heptapod.net/mercurial/ci-images/mercurial-core:$HG_CI_IMAGE_TAG image: registry.heptapod.net/mercurial/ci-images/mercurial-core:$HG_CI_IMAGE_TAG
variables: variables:
PYTHON: python PYTHON: python3
TEST_HGMODULEPOLICY: "allow" TEST_HGMODULEPOLICY: "allow"
HG_CI_IMAGE_TAG: "latest" HG_CI_IMAGE_TAG: "latest"
TEST_HGTESTS_ALLOW_NETIO: "0" TEST_HGTESTS_ALLOW_NETIO: "0"
.all_template: &all .all_template: &all
when: always when: always
.runtests_template: &runtests .runtests_template: &runtests
<<: *all <<: *all
stage: tests stage: tests
# The runner made a clone as root. # The runner made a clone as root.
# We make a new clone owned by user used to run the step. # We make a new clone owned by user used to run the step.
before_script: before_script:
- hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no - hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no
- hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'` - hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'`
- cd /tmp/mercurial-ci/ - cd /tmp/mercurial-ci/
- ls -1 tests/test-check-*.* > /tmp/check-tests.txt - ls -1 tests/test-check-*.* > /tmp/check-tests.txt
- black --version - black --version
- clang-format --version - clang-format --version
script: script:
- echo "python used, $PYTHON" - echo "python used, $PYTHON"
- echo "$RUNTEST_ARGS" - echo "$RUNTEST_ARGS"
- HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS - HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS
checks-py2: checks:
<<: *runtests
variables:
RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
checks-py3:
<<: *runtests <<: *runtests
variables: variables:
RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt" RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
PYTHON: python3
rust-cargo-test-py2: &rust_cargo_test rust-cargo-test:
<<: *all <<: *all
stage: tests stage: tests
script: script:
- echo "python used, $PYTHON"
- make rust-tests - make rust-tests
rust-cargo-test-py3:
stage: tests
<<: *rust_cargo_test
variables:
PYTHON: python3
phabricator-refresh: phabricator-refresh:
stage: phabricator stage: phabricator
variables: variables:
DEFAULT_COMMENT: ":white_check_mark: refresh by Heptapod after a successful CI run (:octopus: :green_heart:)" DEFAULT_COMMENT: ":white_check_mark: refresh by Heptapod after a successful CI run (:octopus: :green_heart:)"
STABLE_COMMENT: ":white_check_mark: refresh by Heptapod after a successful CI run (:octopus: :green_heart:)\n⚠ This patch is intended for stable ⚠\n{image https://media.giphy.com/media/nYI8SmmChYXK0/source.gif}" STABLE_COMMENT: ":white_check_mark: refresh by Heptapod after a successful CI run (:octopus: :green_heart:)\n⚠ This patch is intended for stable ⚠\n{image https://media.giphy.com/media/nYI8SmmChYXK0/source.gif}"
script: script:
- | - |
if [ `hg branch` == "stable" ]; then if [ `hg branch` == "stable" ]; then
./contrib/phab-refresh-stack.sh --comment "$STABLE_COMMENT"; ./contrib/phab-refresh-stack.sh --comment "$STABLE_COMMENT";
else else
./contrib/phab-refresh-stack.sh --comment "$DEFAULT_COMMENT"; ./contrib/phab-refresh-stack.sh --comment "$DEFAULT_COMMENT";
fi fi
test-py2: test:
<<: *runtests
variables:
RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt"
TEST_HGMODULEPOLICY: "c"
TEST_HGTESTS_ALLOW_NETIO: "1"
test-py3:
<<: *runtests <<: *runtests
variables: variables:
RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt"
PYTHON: python3
TEST_HGMODULEPOLICY: "c" TEST_HGMODULEPOLICY: "c"
TEST_HGTESTS_ALLOW_NETIO: "1" TEST_HGTESTS_ALLOW_NETIO: "1"
test-py2-pure: test-pure:
<<: *runtests <<: *runtests
variables: variables:
RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
TEST_HGMODULEPOLICY: "py" TEST_HGMODULEPOLICY: "py"
test-py3-pure: test-rust:
<<: *runtests
variables:
RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
PYTHON: python3
TEST_HGMODULEPOLICY: "py"
test-py2-rust:
<<: *runtests <<: *runtests
variables: variables:
HGWITHRUSTEXT: cpython HGWITHRUSTEXT: cpython
RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"
TEST_HGMODULEPOLICY: "rust+c" TEST_HGMODULEPOLICY: "rust+c"
test-py3-rust: test-rhg:
<<: *runtests
variables:
HGWITHRUSTEXT: cpython
RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"
PYTHON: python3
TEST_HGMODULEPOLICY: "rust+c"
test-py3-rhg:
<<: *runtests <<: *runtests
variables: variables:
HGWITHRUSTEXT: cpython HGWITHRUSTEXT: cpython
RUNTEST_ARGS: "--rust --rhg --blacklist /tmp/check-tests.txt" RUNTEST_ARGS: "--rust --rhg --blacklist /tmp/check-tests.txt"
PYTHON: python3
TEST_HGMODULEPOLICY: "rust+c" TEST_HGMODULEPOLICY: "rust+c"
test-py2-chg: test-chg:
<<: *runtests <<: *runtests
variables: variables:
RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg" RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"
TEST_HGMODULEPOLICY: "c" TEST_HGMODULEPOLICY: "c"
test-py3-chg: check-pytype:
<<: *runtests
variables:
PYTHON: python3
RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"
TEST_HGMODULEPOLICY: "c"
check-pytype-py3:
extends: .runtests_template extends: .runtests_template
before_script: before_script:
- hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no - hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no
- hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'` - hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'`
- cd /tmp/mercurial-ci/ - cd /tmp/mercurial-ci/
- make local PYTHON=$PYTHON - make local PYTHON=$PYTHON
- $PYTHON -m pip install --user -U pytype==2021.04.15 - $PYTHON -m pip install --user -U pytype==2021.04.15
variables: variables:
RUNTEST_ARGS: " --allow-slow-tests tests/test-check-pytype.t" RUNTEST_ARGS: " --allow-slow-tests tests/test-check-pytype.t"
HGTEST_SLOWTIMEOUT: "3600" HGTEST_SLOWTIMEOUT: "3600"
PYTHON: python3
TEST_HGMODULEPOLICY: "c" TEST_HGMODULEPOLICY: "c"
# `sh.exe --login` sets a couple of extra environment variables that are defined # `sh.exe --login` sets a couple of extra environment variables that are defined
# in the MinGW shell, but switches CWD to /home/$username. The previous value # in the MinGW shell, but switches CWD to /home/$username. The previous value
# is stored in OLDPWD. Of the added variables, MSYSTEM is crucial to running # is stored in OLDPWD. Of the added variables, MSYSTEM is crucial to running
# run-tests.py- it is needed to make run-tests.py generate a `python3` script # run-tests.py- it is needed to make run-tests.py generate a `python3` script
# that satisfies the various shebang lines and delegates to `py -3`. # that satisfies the various shebang lines and delegates to `py -3`.
.window_runtests_template: &windows_runtests .window_runtests_template: &windows_runtests