This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8122

pyoxidizer: allow extensions to be loaded from the file system
ClosedPublic

Authored by martinvonz on Feb 14 2020, 11:30 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG6689cebacb32: pyoxidizer: allow extensions to be loaded from the file system
rHG4e3dbb48ef76: pyoxidizer: allow extensions to be loaded from the file system
Summary

It seems that setting this config is all that's needed to be able to
load extensions from the file system (which we clearly want). Thanks
for making this work, Gregory Szorc!.

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

martinvonz created this revision.Feb 14 2020, 11:30 PM
mharbison72 added a subscriber: mharbison72.Feb 15 2020, 1:00 AM

Does this also allow extensions to be bundled in the exe, or are you thinking we need to leave the extensions outside the binary?

martinvonz added a comment.Feb 15 2020, 1:11 AM
In D8122#120939, @mharbison72 wrote:

Does this also allow extensions to be bundled in the exe, or are you thinking we need to leave the extensions outside the binary?

I'm pretty sure this just tells the PyOxidized binary to *also* allow importing from file system. The bundled extensions are still imported properly from inside the binary.

indygreg accepted this revision.Feb 15 2020, 4:54 PM

This simply tells PyOxidizer to load the sys.meta_path importer that performs filesystem-based importing, like a normal Python process. https://pyoxidizer.readthedocs.io/en/stable/config_api.html#pythoninterpreterconfig

This revision is now accepted and ready to land.Feb 15 2020, 4:54 PM

Revision Contents
Changeset List

PathPackages
Mcontrib/packaging/pyoxidizer.bzl (2 lines)

Diff 20309

contrib/packaging/pyoxidizer.bzl

def make_exe(): def make_exe():
dist = default_python_distribution() dist = default_python_distribution()
code = "import hgdemandimport; hgdemandimport.enable(); from mercurial import dispatch; dispatch.run()" code = "import hgdemandimport; hgdemandimport.enable(); from mercurial import dispatch; dispatch.run()"
config = PythonInterpreterConfig( config = PythonInterpreterConfig(
raw_allocator = "system", raw_allocator = "system",
run_eval = code, run_eval = 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. # We need this to make resourceutil happy, since it looks for sys.frozen.
sys_frozen = True, sys_frozen = True,
legacy_windows_stdio = True, legacy_windows_stdio = True,
) )
exe = dist.to_python_executable( exe = dist.to_python_executable(
name = "hg", name = "hg",
config = config, config = config,