diff options
| author | Adrien Ferrand <adferrand@users.noreply.github.com> | 2019-11-06 21:17:53 +0300 |
|---|---|---|
| committer | Brad Warren <bmw@users.noreply.github.com> | 2019-11-06 21:17:53 +0300 |
| commit | baf43a2dbc6ab105ba69165a9e66ac8175ca41cd (patch) | |
| tree | ff49f465867ee3ac3db314b6c293dae9cdbe9344 /windows-installer | |
| parent | 9b848b1d65783000a13ef3f94ac5fe0e8c3879e7 (diff) | |
Pin all build dependencies for the Windows installer (#7504)
This PR uses pipstrap to bootstrap the venv used to build Windows installers. This effectively pin all build dependencies, since pynsist is already installed through pip_install.py script.
* Use pipstrap
* Pin also NSIS version
Diffstat (limited to 'windows-installer')
| -rw-r--r-- | windows-installer/construct.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/windows-installer/construct.py b/windows-installer/construct.py index 94ce1fa4d..cdf309f13 100644 --- a/windows-installer/construct.py +++ b/windows-installer/construct.py @@ -12,6 +12,7 @@ import time PYTHON_VERSION = (3, 7, 4) PYTHON_BITNESS = 32 PYWIN32_VERSION = 225 # do not forget to edit pywin32 dependency accordingly in setup.py +NSIS_VERSION = '3.04' def main(): @@ -53,9 +54,9 @@ def _compile_wheels(repo_path, build_path, venv_python): def _prepare_build_tools(venv_path, venv_python, repo_path): print('Prepare build tools') subprocess.check_call([sys.executable, '-m', 'venv', venv_path]) - subprocess.check_call(['choco', 'upgrade', '-y', 'nsis']) - subprocess.check_call([venv_python, '-m', 'pip', 'install', '--upgrade', 'pip']) - subprocess.check_call([venv_python, os.path.join(repo_path, 'tools', 'pip_install.py'), 'wheel', 'pynsist']) + subprocess.check_call([venv_python, os.path.join(repo_path, 'letsencrypt-auto-source', 'pieces', 'pipstrap.py')]) + subprocess.check_call([venv_python, os.path.join(repo_path, 'tools', 'pip_install.py'), 'pynsist']) + subprocess.check_call(['choco', 'upgrade', '-y', 'nsis', '--version', NSIS_VERSION]) @contextlib.contextmanager |