Mercurial > public > mercurial-scm > hg-stable
changeset 52690:022c91426022
pyoxidizer: fix building with PEP 517 support
I'm not sure when this broke, because f6b045910d82 explicitly says it's fixing
something, but a recent attempt to build pyoxidizer on Windows specifically
flagged `--no-use-pep517` as a problem. Now that we have PEP 517 support for
building, this goes away and pyoxidizer 0.17.0 with rust 1.54.0 works again
(yeah, these should be updated).
Note that `py -3.9 run-tests.py --pyoxidized` fails to get the version info on a
zstd repo, and thus fails build and install hg to run the tests. A zlib repo
works, and since there's a PR that changes obtaining the version info from
`setuptools-scm`, I'm not bothering to fix this. With the zlib test run, the
following are broken:
Failed test-commit-interactive.t: output changed
Failed test-i18n.t: output changed
Failed test-log.t:
The diffs all look to be related to not applying the requested i18n locale. IDR
if this was the case when this was being tested 4 years ago (but I suspect it
was not).
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 11 Jan 2025 18:30:48 -0500 |
parents | f5091286b10c |
children | 6d132bbc5a7f |
files | contrib/heptapod-ci.yml rust/hgcli/pyoxidizer.bzl |
diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/heptapod-ci.yml Wed Jan 08 05:07:00 2025 +0100 +++ b/contrib/heptapod-ci.yml Sat Jan 11 18:30:48 2025 -0500 @@ -530,8 +530,10 @@ windows-pyox: extends: .windows-runtests - when: manual # pyoxidizer builds seem broken with --no-use-pep517 + when: manual variables: + RUNTEST_ARGS: "" + WHEEL_ARG: "" FLAVOR: "--pyoxidized" macos:
--- a/rust/hgcli/pyoxidizer.bzl Wed Jan 08 05:07:00 2025 +0100 +++ b/rust/hgcli/pyoxidizer.bzl Sat Jan 11 18:30:48 2025 -0500 @@ -142,7 +142,7 @@ ) # Add Mercurial to resources. - exe.add_python_resources(exe.pip_install(["--verbose", "--no-use-pep517", ROOT])) + exe.add_python_resources(exe.pip_install(["--verbose", ROOT])) # On Windows, we install extra packages for convenience. if IS_WINDOWS: