Mercurial > hg
changeset 45749:f95b16796688 stable
pyoxidizer: update to PyOxidizer 0.9
We were previously using a Git commit from a few days before the 0.8
release. This commit upgrades us to the just-released 0.9 release.
This required some Starlark changes due to backwards incompatible
changes.
Differential Revision: https://phab.mercurial-scm.org/D9228
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sun, 18 Oct 2020 22:48:00 -0700 |
| parents | 661f1e3b07af |
| children | c00595736595 |
| files | contrib/automation/hgautomation/linux.py contrib/install-windows-dependencies.ps1 rust/hgcli/pyoxidizer.bzl |
| diffstat | 3 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/automation/hgautomation/linux.py Tue Oct 20 22:06:30 2020 +0530 +++ b/contrib/automation/hgautomation/linux.py Sun Oct 18 22:48:00 2020 -0700 @@ -75,7 +75,7 @@ sudo -H -u hg -g hg /home/hg/.cargo/bin/rustup install 1.31.1 1.46.0 sudo -H -u hg -g hg /home/hg/.cargo/bin/rustup component add clippy -sudo -H -u hg -g hg /home/hg/.cargo/bin/cargo install --git https://github.com/indygreg/PyOxidizer.git --rev 4697fb25918dfad6dc73288daeea501063963a08 pyoxidizer +sudo -H -u hg -g hg /home/hg/.cargo/bin/cargo install --version 0.9.0 pyoxidizer '''
--- a/contrib/install-windows-dependencies.ps1 Tue Oct 20 22:06:30 2020 +0530 +++ b/contrib/install-windows-dependencies.ps1 Sun Oct 18 22:48:00 2020 -0700 @@ -125,7 +125,7 @@ Invoke-Process "${prefix}\cargo\bin\rustup.exe" "component add clippy" # Install PyOxidizer for packaging. - Invoke-Process "${prefix}\cargo\bin\cargo.exe" "install --git https://github.com/indygreg/PyOxidizer.git --rev 4697fb25918dfad6dc73288daeea501063963a08 pyoxidizer" + Invoke-Process "${prefix}\cargo\bin\cargo.exe" "install --version 0.9.0 pyoxidizer" } function Install-Dependencies($prefix) {
--- a/rust/hgcli/pyoxidizer.bzl Tue Oct 20 22:06:30 2020 +0530 +++ b/rust/hgcli/pyoxidizer.bzl Sun Oct 18 22:48:00 2020 -0700 @@ -39,18 +39,18 @@ # Extension may depend on any Python functionality. Include all # extensions. packaging_policy.extension_module_filter = "all" - packaging_policy.resources_policy = "prefer-in-memory-fallback-filesystem-relative:lib" + packaging_policy.resources_location = "in-memory" + packaging_policy.resources_location_fallback = "filesystem-relative:lib" packaging_policy.register_resource_callback(resource_callback) - config = PythonInterpreterConfig( - raw_allocator = "system", - run_eval = RUN_CODE, - # We want to let the user load extensions from the file system - filesystem_importer = True, - # We need this to make resourceutil happy, since it looks for sys.frozen. - sys_frozen = True, - legacy_windows_stdio = True, - ) + config = dist.make_python_interpreter_config() + config.raw_allocator = "system" + config.run_mode = "eval:%s" % RUN_CODE + # We want to let the user load extensions from the file system + config.filesystem_importer = True + # We need this to make resourceutil happy, since it looks for sys.frozen. + config.sys_frozen = True + config.legacy_windows_stdio = True exe = dist.to_python_executable( name = "hg", @@ -104,5 +104,5 @@ # Everything below this is typically managed by PyOxidizer and doesn't need # to be updated by people. -PYOXIDIZER_VERSION = "0.8.0-pre" -PYOXIDIZER_COMMIT = "4697fb25918dfad6dc73288daeea501063963a08" +PYOXIDIZER_VERSION = "0.9.0" +PYOXIDIZER_COMMIT = "1fbc264cc004226cd76ee452e0a386ffca6ccfb1"