This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6067

inno: stop shipping pywin32
ClosedPublic

Authored by indygreg on Mar 3 2019, 6:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7a1433e90482: inno: stop shipping pywin32
Summary

Ancient versions of Mercurial relied on pywin32 and I suspect
that's why we have this dependency.

We also ship the "keyring" package, which has a dependency
on "pywin32-ctypes" (providing the "win32ctypes" package).
This is a stripped down version of pywin32 that doesn't have
as many dependencies.

Since we don't have a dependency on pywin32 and since pywin32
is a bit annoying to package, let's get rid of it.

With this change, py2exe no longers picks up DLL dependencies
on various UCRT DLLs (because we no longer have a .pyd file
beloning to pywin32 which was pulling them in). So, we were
able to remove code in support of the UCRT DLLs.

.. bc::

The Windows Inno installers no longer ship the pywin32 package.

This package was being bundled for historical reasons. Mercurial
stopped using pywin32 several years ago and the disappearance
of this package should not have any meaningful impact.

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

indygreg created this revision.Mar 3 2019, 6:52 PM
indygreg updated this revision to Diff 14333.Mar 3 2019, 6:53 PM
indygreg edited the summary of this revision. (Show Details)Mar 3 2019, 9:22 PM
indygreg added a child revision: D6068: inno: remove w9xpopen.exe.
indygreg updated this revision to Diff 14339.
Closed by commit rHG7a1433e90482: inno: stop shipping pywin32 (authored by indygreg). · Explain WhyMar 5 2019, 10:24 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14370

contrib/packaging/inno/build.py

else: else:
if py_arch != '32bit': if py_arch != '32bit':
raise Exception('architecture mismatch: Visual C++ environment ' raise Exception('architecture mismatch: Visual C++ environment '
'is configured for 32-bit but Python is 64-bit') 'is configured for 32-bit but Python is 64-bit')
if py_version != 2: if py_version != 2:
raise Exception('Only Python 2 is currently supported') raise Exception('Only Python 2 is currently supported')
# Some extensions may require DLLs from the Universal C Runtime (UCRT).
# These are typically not in PATH and py2exe will have trouble finding
# them. We find the Windows 10 SDK and the UCRT files within.
sdk_path = (pathlib.Path(os.environ['ProgramFiles(x86)']) /
'Windows Kits' / '10' / 'Redist' / 'ucrt' / 'DLLs')
if vc_x64:
sdk_path = sdk_path / 'x64'
else:
sdk_path = sdk_path / 'x86'
if not sdk_path.is_dir():
raise Exception('UCRT files could not be found at %s' % sdk_path)
build_dir.mkdir(exist_ok=True) build_dir.mkdir(exist_ok=True)
gettext_pkg = download_entry(DOWNLOADS['gettext'], build_dir) gettext_pkg = download_entry(DOWNLOADS['gettext'], build_dir)
gettext_dep_pkg = download_entry(DOWNLOADS['gettext-dep'], build_dir) gettext_dep_pkg = download_entry(DOWNLOADS['gettext-dep'], build_dir)
virtualenv_pkg = download_entry(DOWNLOADS['virtualenv'], build_dir) virtualenv_pkg = download_entry(DOWNLOADS['virtualenv'], build_dir)
py2exe_pkg = download_entry(DOWNLOADS['py2exe'], build_dir) py2exe_pkg = download_entry(DOWNLOADS['py2exe'], build_dir)
venv_path = build_dir / ('venv-inno-%s' % ('x64' if vc_x64 else 'x86')) venv_path = build_dir / ('venv-inno-%s' % ('x64' if vc_x64 else 'x86'))
py2exe_py_path = venv_path / 'Lib' / 'site-packages' / 'py2exe' py2exe_py_path = venv_path / 'Lib' / 'site-packages' / 'py2exe'
if not py2exe_py_path.exists(): if not py2exe_py_path.exists():
print('building py2exe') print('building py2exe')
subprocess.run([str(venv_python), 'setup.py', 'install'], subprocess.run([str(venv_python), 'setup.py', 'install'],
cwd=py2exe_source_path, cwd=py2exe_source_path,
env=env, env=env,
check=True) check=True)
if str(sdk_path) not in os.environ['PATH'].split(os.pathsep):
print('adding %s to PATH' % sdk_path)
env['PATH'] = '%s%s%s' % (
os.environ['PATH'], os.pathsep, str(sdk_path))
# Register location of msgfmt and other binaries. # Register location of msgfmt and other binaries.
env['PATH'] = '%s%s%s' % ( env['PATH'] = '%s%s%s' % (
env['PATH'], os.pathsep, str(gettext_root / 'bin')) env['PATH'], os.pathsep, str(gettext_root / 'bin'))
print('building Mercurial') print('building Mercurial')
subprocess.run( subprocess.run(
[str(venv_python), 'setup.py', [str(venv_python), 'setup.py',
'py2exe', '-b', '3' if vc_x64 else '2', 'py2exe', '-b', '3' if vc_x64 else '2',

contrib/packaging/inno/readme.rst

Requirements Requirements
============ ============
Building the Inno installer requires a Windows machine. Building the Inno installer requires a Windows machine.
The following system dependencies must be installed: The following system dependencies must be installed:
* Python 2.7 (download from https://www.python.org/downloads/) * Python 2.7 (download from https://www.python.org/downloads/)
* Microsoft Visual C++ Compiler for Python 2.7 * Microsoft Visual C++ Compiler for Python 2.7
(https://www.microsoft.com/en-us/download/details.aspx?id=44266) (https://www.microsoft.com/en-us/download/details.aspx?id=44266)
* Windows 10 SDK (download from
https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk
or install via a modern version of Visual Studio)
* Inno Setup (http://jrsoftware.org/isdl.php) version 5.4 or newer. * Inno Setup (http://jrsoftware.org/isdl.php) version 5.4 or newer.
Be sure to install the optional Inno Setup Preprocessor feature, Be sure to install the optional Inno Setup Preprocessor feature,
which is required. which is required.
* Python 3.5+ (to run the ``build.py`` script) * Python 3.5+ (to run the ``build.py`` script)
Building Building
======== ========

contrib/packaging/inno/requirements.txt

--hash=sha256:ca33f5ccc542b9ffaa196ee9a33488069e5e7eac77d5b81969f8a3ce74d0230c --hash=sha256:ca33f5ccc542b9ffaa196ee9a33488069e5e7eac77d5b81969f8a3ce74d0230c
pygments==2.3.1 \ pygments==2.3.1 \
--hash=sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a \ --hash=sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a \
--hash=sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d --hash=sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d
pywin32-ctypes==0.2.0 \ pywin32-ctypes==0.2.0 \
--hash=sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 \ --hash=sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 \
--hash=sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98 \ --hash=sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98 \
# via keyring # via keyring
pywin32==224 \
--hash=sha256:22e218832a54ed206452c8f3ca9eff07ef327f8e597569a4c2828be5eaa09a77 \
--hash=sha256:32b37abafbfeddb0fe718008d6aada5a71efa2874f068bee1f9e703983dcc49a \
--hash=sha256:35451edb44162d2f603b5b18bd427bc88fcbc74849eaa7a7e7cfe0f507e5c0c8 \
--hash=sha256:4eda2e1e50faa706ff8226195b84fbcbd542b08c842a9b15e303589f85bfb41c \
--hash=sha256:5f265d72588806e134c8e1ede8561739071626ea4cc25c12d526aa7b82416ae5 \
--hash=sha256:6852ceac5fdd7a146b570655c37d9eacd520ed1eaeec051ff41c6fc94243d8bf \
--hash=sha256:6dbc4219fe45ece6a0cc6baafe0105604fdee551b5e876dc475d3955b77190ec \
--hash=sha256:9bd07746ce7f2198021a9fa187fa80df7b221ec5e4c234ab6f00ea355a3baf99
urllib3==1.24.1 \ urllib3==1.24.1 \
--hash=sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39 \ --hash=sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39 \
--hash=sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22 \ --hash=sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22 \
# via dulwich # via dulwich

contrib/packaging/inno/requirements.txt.in

docutils docutils
dulwich dulwich
keyring keyring
pygments pygments
pywin32

setup.py

try: try:
import pygments import pygments
pygments.__version__ pygments.__version__
py2exepackages.append('pygments') py2exepackages.append('pygments')
except ImportError: except ImportError:
pass pass
try: try:
import pywintypes import win32ctypes
pywintypes.TRUE win32ctypes.__version__
py2exepackages.append('pywintypes') py2exepackages.append('win32ctypes')
except ImportError: except ImportError:
pass pass
if os.name == 'nt': if os.name == 'nt':
# Windows binary file versions for exe/dll files must have the # Windows binary file versions for exe/dll files must have the
# form W.X.Y.Z, where W,X,Y,Z are numbers in the range 0..65535 # form W.X.Y.Z, where W,X,Y,Z are numbers in the range 0..65535
setupversion = setupversion.split(r'+', 1)[0] setupversion = setupversion.split(r'+', 1)[0]
ext_modules=extmodules, ext_modules=extmodules,
data_files=datafiles, data_files=datafiles,
package_data=packagedata, package_data=packagedata,
cmdclass=cmdclass, cmdclass=cmdclass,
distclass=hgdist, distclass=hgdist,
options={ options={
'py2exe': { 'py2exe': {
'packages': py2exepackages, 'packages': py2exepackages,
'dll_excludes': [
'api-ms-win-core-apiquery-l1-1-0.dll',
'api-ms-win-core-delayload-l1-1-0.dll',
'api-ms-win-core-delayload-l1-1-1.dll',
'api-ms-win-core-heap-l2-1-0.dll',
'api-ms-win-core-libraryloader-l1-2-0.dll',
'api-ms-win-core-registry-l1-1-0.dll',
]
}, },
'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)