Skip to content
Snippets Groups Projects
Commit 022c9142 authored by Matt Harbison's avatar Matt Harbison
Browse files

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).
parent f5091286
No related branches found
No related tags found
2 merge requests!1292Draft: 7.0rc preparation,!1208pyoxidizer: fix building with PEP 517 support
Pipeline #96974 passed
......@@ -530,5 +530,5 @@
windows-pyox:
extends: .windows-runtests
when: manual # pyoxidizer builds seem broken with --no-use-pep517
when: manual
variables:
......@@ -534,4 +534,6 @@
variables:
RUNTEST_ARGS: ""
WHEEL_ARG: ""
FLAVOR: "--pyoxidized"
macos:
......
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment