Mercurial > public > mercurial-scm > hg
diff rust/hgcli/pyoxidizer.bzl @ 49836:3d7bf111f01e stable
packaging: add dependencies to the PyOxidizer build on macOS
Otherwise, we get a bunch of test failures for missing things like pygments, or
tests skipped entirely. The input file is a copy/paste from the equivalent
Windows file, but with dulwich, pygit2, and pytest-vcr commented out because
the build process errors out with them, flagging them as incompatible with
loading from memory. I have no idea if that's actually true or not, because
I've noticed that if I don't `make clean` after every build, the next build
flags the watchman stuff as incompatible with loading from memory.
The remaining failures are:
Failed test-alias.t: output changed
Failed test-basic.t: output changed
Failed test-check-help.t: output changed
Failed test-commit-interactive.t: output changed
Failed test-extension.t: output changed
Failed test-help.t: output changed
Failed test-i18n.t: output changed
Failed test-log.t: output changed
Failed test-qrecord.t: output changed
Failed test-share-safe.t: output changed
Most of the issues seem related to loading help for disabled extensions from
`hgext.__index__`, namely the full extension help being unavailable, not being
able to resolve what commands are provided by what extension, and not having the
command level help available.
test-log.t, test-commit-interactive.t, and test-i18n.t look like i18n (or lack
thereof) issues.
test-basic.t is just odd:
@@ -55,7 +55,7 @@
On Python 3, stdio may be None:
$ hg debuguiprompt --config ui.interactive=true 0<&-
- abort: Bad file descriptor (no-rhg !)
+ abort: response expected
abort: response expected (rhg !)
[255]
$ hg version -q 0<&-
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Tue, 06 Dec 2022 17:12:59 -0500 |
parents | 06107198f95b |
children | 022c91426022 |
line wrap: on
line diff
--- a/rust/hgcli/pyoxidizer.bzl Tue Dec 06 15:32:11 2022 -0500 +++ b/rust/hgcli/pyoxidizer.bzl Tue Dec 06 17:12:59 2022 -0500 @@ -33,6 +33,7 @@ TIME_STAMP_SERVER_URL = VARS.get("TIME_STAMP_SERVER_URL", "http://timestamp.digicert.com") IS_WINDOWS = "windows" in BUILD_TARGET_TRIPLE +IS_MACOS = "apple" in BUILD_TARGET_TRIPLE # Use in-memory resources for all resources. If false, most of the Python # stdlib will be in memory, but other things such as Mercurial itself will not @@ -148,6 +149,10 @@ exe.add_python_resources( exe.pip_install(["-r", ROOT + "/contrib/packaging/requirements-windows-py3.txt"]), ) + if IS_MACOS: + exe.add_python_resources( + exe.pip_install(["-r", ROOT + "/contrib/packaging/requirements-macos.txt"]), + ) extra_packages = VARS.get("extra_py_packages", "") if extra_packages: for extra in extra_packages.split(","):