##// END OF EJS Templates
packaging: merge the requirements.txt files for WiX and Inno...
Matt Harbison -
r44711:e2589b9e stable
parent child Browse files
Show More
@@ -66,7 +66,7 b' def build('
66 staging_dir = inno_build_dir / 'stage'
66 staging_dir = inno_build_dir / 'stage'
67
67
68 requirements_txt = (
68 requirements_txt = (
69 source_dir / 'contrib' / 'packaging' / 'inno' / 'requirements.txt'
69 source_dir / 'contrib' / 'packaging' / 'requirements_win32.txt'
70 )
70 )
71
71
72 inno_build_dir.mkdir(parents=True, exist_ok=True)
72 inno_build_dir.mkdir(parents=True, exist_ok=True)
@@ -343,7 +343,7 b' def build_installer('
343 dist_dir = source_dir / 'dist'
343 dist_dir = source_dir / 'dist'
344 wix_dir = source_dir / 'contrib' / 'packaging' / 'wix'
344 wix_dir = source_dir / 'contrib' / 'packaging' / 'wix'
345
345
346 requirements_txt = wix_dir / 'requirements.txt'
346 requirements_txt = 'requirements_win32.txt'
347
347
348 build_py2exe(
348 build_py2exe(
349 source_dir,
349 source_dir,
@@ -2,7 +2,7 b''
2 # This file is autogenerated by pip-compile
2 # This file is autogenerated by pip-compile
3 # To update, run:
3 # To update, run:
4 #
4 #
5 # pip-compile --generate-hashes --output-file=contrib/packaging/wix/requirements.txt contrib/packaging/wix/requirements.txt.in
5 # pip-compile --generate-hashes --output-file=contrib/packaging/requirements_win32.txt contrib/packaging/requirements_win32.txt.in
6 #
6 #
7 certifi==2019.9.11 \
7 certifi==2019.9.11 \
8 --hash=sha256:e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50 \
8 --hash=sha256:e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50 \
1 NO CONTENT: file renamed from contrib/packaging/wix/requirements.txt.in to contrib/packaging/requirements_win32.txt.in
NO CONTENT: file renamed from contrib/packaging/wix/requirements.txt.in to contrib/packaging/requirements_win32.txt.in
1 NO CONTENT: file was removed
NO CONTENT: file was removed
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now