( )⚙ D11770 backout: backed out changeset 5d83a40cd3f8

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11770

backout: backed out changeset 5d83a40cd3f8
ClosedPublic

Authored by Alphare on Nov 22 2021, 4:48 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG0ad593b60760: backout: backed out changeset 5d83a40cd3f8
Summary

This is the re-send of the backout in D11757 that I accidentally queued. I'll
rewrite the original commit message:

...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.

(end of the old commit message)

On top of this, we have a solid lead to have competent people take care of this
packaging issue for us in time for the 6.1 release, which is really the main
reason for us to wait. We're trying our best to make this work, so please bear
with us.

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 22 2021, 4:48 AM
Alphare added subscribers: martinvonz, durin42.Nov 29 2021, 7:37 AM

@martinvonz @durin42 pinging you because you were both involved in the last diff

marmoute accepted this revision.Nov 29 2021, 7:43 AM
martinvonz added a comment.Nov 29 2021, 11:46 AM

we have a solid lead to have competent people take care of this packaging issue for us in time for the 6.1 release

Are you able to say who they are?

Alphare added a comment.Nov 29 2021, 11:54 AM
In D11770#181207, @martinvonz wrote:

we have a solid lead to have competent people take care of this packaging issue for us in time for the 6.1 release

Are you able to say who they are?

Certainly: https://www.courtbouillon.org

Alphare added a commit: rHG0ad593b60760: backout: backed out changeset 5d83a40cd3f8.Dec 3 2021, 9:52 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG0ad593b60760: backout: backed out changeset 5d83a40cd3f8 (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 31298

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