This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11757

backout: backout 5d83a40cd3f8 and re-instate Python 2 support
ClosedPublic

Authored by Alphare on Nov 15 2021, 12:07 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG645ae3ee63f9: backout: backout 5d83a40cd3f8 and re-instate Python 2 support
Summary

...sigh

We do not have Python 3 packaging for thg on Windows where the vast majority of
of users use the thg installer for Mercurial. Until this is done (hopefully
this cycle), we're keeping Python 2.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.Nov 15 2021, 12:07 PM
martinvonz added a comment.Nov 15 2021, 12:13 PM

Until this is done (hopefully this cycle), we're keeping Python 2.

To make sure I understand correctly, "this cycle" here refers to the cycle *after* 6.0? So we're instead hoping that 6.1 will be the last release with support for Python 2?

Alphare added a comment.Nov 15 2021, 12:19 PM
In D11757#180387, @martinvonz wrote:

Until this is done (hopefully this cycle), we're keeping Python 2.

To make sure I understand correctly, "this cycle" here refers to the cycle *after* 6.0? So we're instead hoping that 6.1 will be the last release with support for Python 2?

This patch basically mean that if we fix thg packaging before 6.1 is released, we can drop Python 2. For us developers, that means still supporting Python 2 until this is done. Could be tomorrow (fingers crossed heh), at the end of the cycle, or in Mercurial 7.8 if nothing moves on. As said previously we're trying to make that work currently internally at Octobus, but it's really not something that we have time (or really expertise) for right now unfortunately.

Alphare added a commit: rHG645ae3ee63f9: backout: backout 5d83a40cd3f8 and re-instate Python 2 support.Nov 15 2021, 1:50 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG645ae3ee63f9: backout: backout 5d83a40cd3f8 and re-instate Python 2 support (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.
durin42 added a comment.Nov 16 2021, 5:57 PM
In D11757#180388, @Alphare wrote:
In D11757#180387, @martinvonz wrote:

Until this is done (hopefully this cycle), we're keeping Python 2.

To make sure I understand correctly, "this cycle" here refers to the cycle *after* 6.0? So we're instead hoping that 6.1 will be the last release with support for Python 2?

This patch basically mean that if we fix thg packaging before 6.1 is released, we can drop Python 2. For us developers, that means still supporting Python 2 until this is done. Could be tomorrow (fingers crossed heh), at the end of the cycle, or in Mercurial 7.8 if nothing moves on. As said previously we're trying to make that work currently internally at Octobus, but it's really not something that we have time (or really expertise) for right now unfortunately.

I'm not comfortable with this state of affairs, and would like the removal of Python 2 to be reinstated: at this point it's been over a year of hopeful yearning that someone will fix tortoisehg, and at this point I think we need to let it break. It's nice having the GUI, and I hope someone picks it up, but I'm not willing to have hg tied to supporting Python 2 forever on the off chance that someone will modernize tortoisehg some day.

Alphare added a comment.Nov 19 2021, 5:28 AM

First, sorry for the noise I caused, I accidentally pushed this change to hg-committed (which was a problem in itself), which triggered a "bug" (arguably a feature) in the landing process. I pruned my change and I can re-submit it later.

In D11757#180472, @durin42 wrote:

I'm not comfortable with this state of affairs, and would like the removal of Python 2 to be reinstated: at this point it's been over a year of hopeful yearning that someone will fix tortoisehg, and at this point I think we need to let it break. It's nice having the GUI, and I hope someone picks it up, but I'm not willing to have hg tied to supporting Python 2 forever on the off chance that someone will modernize tortoisehg some day.

I completely understand your point. In fact I share the same opinion, but what changed my mind is the pretty solid lead we have to have this fixed by competent people before the end of the 6.1 cycle. Knowing this, I'm more inclined to wait on this concrete thing that the previous yearning as you put it.

I think thg is quite important to the ecosystem and especially for Windows users, we would probably be dropping a lot of them.

Revision Contents
Changeset List

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

Diff 31076

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: python3 PYTHON: python
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: checks-py2:
<<: *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: rust-cargo-test-py2: &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: test-py2:
<<: *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-pure: test-py2-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-rust: test-py3-pure:
<<: *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-rhg: test-py3-rust:
<<: *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-chg: test-py2-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"
check-pytype: test-py3-chg:
<<: *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