This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11452

pyoxidizer: add the user site to `sys.path` on macOS
ClosedPublic

Authored by mharbison72 on Sep 17 2021, 5:01 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGe10f5dc7f5bf: pyoxidizer: add the user site to `sys.path` on macOS
Summary

This allows 3rd party extensions that are installed with pip to be picked up,
similar to what we do on Windows. PyOxidizer has a bug that prevents this from
working without this extra help (see 95af358fcdfe), though it appears there's
another wrinkle here with sys._framework too.

I needed this to see if the problem[1] loading the keyring extension on Windows
also occurs on macOS (it doesn't).

[1] https://github.com/indygreg/PyOxidizer/issues/445

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

mharbison72 created this revision.Sep 17 2021, 5:01 PM
Alphare added subscribers: indygreg, Alphare.Sep 20 2021, 4:44 AM

@indygreg Could you take a look at these two changes?

pulkit accepted this revision.Oct 13 2021, 2:30 PM
This revision is now accepted and ready to land.Oct 13 2021, 2:30 PM
mharbison72 added a commit: rHGe10f5dc7f5bf: pyoxidizer: add the user site to `sys.path` on macOS.Oct 13 2021, 6:29 PM
Closed by commit rHGe10f5dc7f5bf: pyoxidizer: add the user site to `sys.path` on macOS (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hgcli/pyoxidizer.bzl (14 lines)

Diff 30793

rust/hgcli/pyoxidizer.bzl

sys.path.append( sys.path.append(
os.path.join( os.path.join(
appdata, appdata,
'Python', 'Python',
'Python%d%d' % (vi[0], vi[1]), 'Python%d%d' % (vi[0], vi[1]),
'site-packages', 'site-packages',
) )
) )
elif sys.platform == "darwin":
vi = sys.version_info
def joinuser(*args):
return os.path.expanduser(os.path.join(*args))
# Note: site.py uses `sys._framework` instead of hardcoding "Python" as the
# 3rd arg, but that is set to an empty string in an oxidized binary. It
# has a fallback to ~/.local when `sys._framework` isn't set, but we want
# to match what the system python uses, so it sees pip installed stuff.
usersite = joinuser("~", "Library", "Python",
"%d.%d" % vi[:2], "lib/python/site-packages")
sys.path.append(usersite)
import hgdemandimport; import hgdemandimport;
hgdemandimport.enable(); hgdemandimport.enable();
from mercurial import dispatch; from mercurial import dispatch;
dispatch.run(); dispatch.run();
""" """
set_build_path(ROOT + "/build/pyoxidizer") set_build_path(ROOT + "/build/pyoxidizer")