This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9856

packaging: allow specifying modules to include with py2exe
ClosedPublic

Authored by mharbison72 on Jan 24 2021, 8:33 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd6cfe45afb18: packaging: allow specifying modules to include with py2exe
Summary

Maybe this was missing because there wasn't a need for it.

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.Jan 24 2021, 8:33 PM
mharbison72 added a comment.Jan 24 2021, 8:34 PM

This is meant for stable, to avoid a partial installation.

mharbison72 added a commit: rHGd6cfe45afb18: packaging: allow specifying modules to include with py2exe.Jan 26 2021, 5:27 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd6cfe45afb18: packaging: allow specifying modules to include with py2exe (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/packaging/hgpackaging/py2exe.py (3 lines)
Msetup.py (7 lines)

Diff 25285

contrib/packaging/hgpackaging/py2exe.py

build_dir: pathlib.Path, build_dir: pathlib.Path,
python_exe: pathlib.Path, python_exe: pathlib.Path,
build_name: str, build_name: str,
venv_requirements_txt: pathlib.Path, venv_requirements_txt: pathlib.Path,
extra_packages=None, extra_packages=None,
extra_excludes=None, extra_excludes=None,
extra_dll_excludes=None, extra_dll_excludes=None,
extra_packages_script=None, extra_packages_script=None,
extra_includes=None,
): ):
"""Build Mercurial with py2exe. """Build Mercurial with py2exe.
Build files will be placed in ``build_dir``. Build files will be placed in ``build_dir``.
py2exe's setup.py doesn't use setuptools. It doesn't have modern logic py2exe's setup.py doesn't use setuptools. It doesn't have modern logic
for finding the Python 2.7 toolchain. So, we require the environment for finding the Python 2.7 toolchain. So, we require the environment
to already be configured with an active toolchain. to already be configured with an active toolchain.
if extra_packages: if extra_packages:
env['HG_PY2EXE_EXTRA_PACKAGES'] = ' '.join(sorted(extra_packages)) env['HG_PY2EXE_EXTRA_PACKAGES'] = ' '.join(sorted(extra_packages))
hgext3rd_extras = sorted( hgext3rd_extras = sorted(
e for e in extra_packages if e.startswith('hgext3rd.') e for e in extra_packages if e.startswith('hgext3rd.')
) )
if hgext3rd_extras: if hgext3rd_extras:
env['HG_PY2EXE_EXTRA_INSTALL_PACKAGES'] = ' '.join(hgext3rd_extras) env['HG_PY2EXE_EXTRA_INSTALL_PACKAGES'] = ' '.join(hgext3rd_extras)
if extra_includes:
env['HG_PY2EXE_EXTRA_INCLUDES'] = ' '.join(sorted(extra_includes))
if extra_excludes: if extra_excludes:
env['HG_PY2EXE_EXTRA_EXCLUDES'] = ' '.join(sorted(extra_excludes)) env['HG_PY2EXE_EXTRA_EXCLUDES'] = ' '.join(sorted(extra_excludes))
if extra_dll_excludes: if extra_dll_excludes:
env['HG_PY2EXE_EXTRA_DLL_EXCLUDES'] = ' '.join( env['HG_PY2EXE_EXTRA_DLL_EXCLUDES'] = ' '.join(
sorted(extra_dll_excludes) sorted(extra_dll_excludes)
) )
py2exe_py_path = venv_path / 'Lib' / 'site-packages' / 'py2exe' py2exe_py_path = venv_path / 'Lib' / 'site-packages' / 'py2exe'

setup.py

'email', 'email',
# implicitly imported per module policy # implicitly imported per module policy
# (cffi wouldn't be used as a frozen exe) # (cffi wouldn't be used as a frozen exe)
'mercurial.cext', 'mercurial.cext',
#'mercurial.cffi', #'mercurial.cffi',
'mercurial.pure', 'mercurial.pure',
] ]
py2exe_includes = []
py2exeexcludes = [] py2exeexcludes = []
py2exedllexcludes = ['crypt32.dll'] py2exedllexcludes = ['crypt32.dll']
if issetuptools: if issetuptools:
extra['python_requires'] = supportedpy extra['python_requires'] = supportedpy
if py2exeloaded: if py2exeloaded:
extra['console'] = [ extra['console'] = [
# We allow some configuration to be supplemented via environment # We allow some configuration to be supplemented via environment
# variables. This is better than setup.cfg files because it allows # variables. This is better than setup.cfg files because it allows
# supplementing configs instead of replacing them. # supplementing configs instead of replacing them.
extrapackages = os.environ.get('HG_PY2EXE_EXTRA_PACKAGES') extrapackages = os.environ.get('HG_PY2EXE_EXTRA_PACKAGES')
if extrapackages: if extrapackages:
py2exepackages.extend(extrapackages.split(' ')) py2exepackages.extend(extrapackages.split(' '))
extra_includes = os.environ.get('HG_PY2EXE_EXTRA_INCLUDES')
if extra_includes:
py2exe_includes.extend(extra_includes.split(' '))
excludes = os.environ.get('HG_PY2EXE_EXTRA_EXCLUDES') excludes = os.environ.get('HG_PY2EXE_EXTRA_EXCLUDES')
if excludes: if excludes:
py2exeexcludes.extend(excludes.split(' ')) py2exeexcludes.extend(excludes.split(' '))
dllexcludes = os.environ.get('HG_PY2EXE_EXTRA_DLL_EXCLUDES') dllexcludes = os.environ.get('HG_PY2EXE_EXTRA_DLL_EXCLUDES')
if dllexcludes: if dllexcludes:
py2exedllexcludes.extend(dllexcludes.split(' ')) py2exedllexcludes.extend(dllexcludes.split(' '))
data_files=datafiles, data_files=datafiles,
package_data=packagedata, package_data=packagedata,
cmdclass=cmdclass, cmdclass=cmdclass,
distclass=hgdist, distclass=hgdist,
options={ options={
'py2exe': { 'py2exe': {
'bundle_files': 3, 'bundle_files': 3,
'dll_excludes': py2exedllexcludes, 'dll_excludes': py2exedllexcludes,
'includes': py2exe_includes,
'excludes': py2exeexcludes, 'excludes': py2exeexcludes,
'packages': py2exepackages, 'packages': py2exepackages,
}, },
'bdist_mpkg': { 'bdist_mpkg': {
'zipdist': False, 'zipdist': False,
'license': 'COPYING', 'license': 'COPYING',
'readme': 'contrib/packaging/macosx/Readme.html', 'readme': 'contrib/packaging/macosx/Readme.html',
'welcome': 'contrib/packaging/macosx/Welcome.html', 'welcome': 'contrib/packaging/macosx/Welcome.html',
}, },
}, },
**extra **extra
) )