Commit efc7e151 authored by Matt Harbison's avatar Matt Harbison

packaging: combine all Windows requirements into a single file

I didn't realize this worked, and this is easier than specifying multiple files
to get a basic setup for a platform when installing.

I pinned a couple of the py2 packages so that they stay on the existing version
when regenerating the file.  The py3 stuff stayed on the existing versions
because there were no updates available.

--HG--
branch : stable
parent d5f05823a128
Pipeline #12844 passed with stage
in 32 minutes and 43 seconds
......@@ -47,6 +47,9 @@ def build_py3(
source_dir / 'contrib' / 'packaging' / 'venv_py3' / 'requirements.txt'
)
if os.name == 'nt':
requirements_txt = requirements_txt.parent / 'requirements_win32.txt'
subprocess.run([
str(venv_pip),
"install",
......@@ -55,15 +58,6 @@ def build_py3(
"--disable-pip-version-check",
], check=True)
if os.name == 'nt':
subprocess.run([
str(venv_pip),
"install",
"-r",
str(requirements_txt.parent / 'requirements_win32.txt'),
"--disable-pip-version-check",
], check=True)
install_mercurial(venv_python, hg_source_dir)
print()
......
......@@ -99,6 +99,9 @@ def build_py2(
source_dir / 'contrib' / 'packaging' / 'venv_py2' / 'requirements.txt'
)
if os.name == 'nt':
requirements_txt = requirements_txt.parent / 'requirements_win32.txt',
subprocess.run([
str(venv_pip),
"install",
......@@ -107,15 +110,6 @@ def build_py2(
"--disable-pip-version-check",
], check=True)
if os.name == 'nt':
subprocess.run([
str(venv_pip),
"install",
"-r",
str(requirements_txt.parent / 'requirements_win32.txt'),
"--disable-pip-version-check",
], check=True)
env = _get_msvc2017_env(vc_x64)
env["CL"] = "/MP" # Enable multiprocessor builds
......
enum34 # Required to build PyQt5 >= 5.11
iniparse
enum34==1.1.6 # Required to build PyQt5 >= 5.11
iniparse==0.4
Pygments
......@@ -2,7 +2,7 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --generate-hashes --output-file=contrib/packaging/venv_py2/requirements_win32.txt contrib/packaging/venv_py2/requirements_win32.txt.in
# pip-compile --generate-hashes --output-file=contrib/packaging/venv_py2/requirements_win32.txt contrib/packaging/venv_py2/requirements.txt.in contrib/packaging/venv_py2/requirements_win32.txt.in
#
alabaster==0.7.12 \
--hash=sha256:446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359 \
......@@ -25,10 +25,18 @@ colorama==0.4.3 \
--hash=sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1 \
# via sphinx
comtypes==1.1.7 \
--hash=sha256:c9d59f57d559613940f22da54d70add066faa23b4fa9b5cd95facdc501a63b0b
--hash=sha256:c9d59f57d559613940f22da54d70add066faa23b4fa9b5cd95facdc501a63b0b \
# via -r contrib/packaging/venv_py2/requirements_win32.txt.in
docutils==0.16 \
--hash=sha256:0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af \
--hash=sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc
--hash=sha256:c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc \
# via -r contrib/packaging/venv_py2/requirements_win32.txt.in, sphinx
enum34==1.1.6 \
--hash=sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850 \
--hash=sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a \
--hash=sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79 \
--hash=sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1 \
# via -r contrib/packaging/venv_py2/requirements.txt.in
idna==2.8 \
--hash=sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407 \
--hash=sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c \
......@@ -37,9 +45,13 @@ imagesize==1.2.0 \
--hash=sha256:6965f19a6a2039c7d48bca7dba2473069ff854c36ae6f19d2cde309d998228a1 \
--hash=sha256:b1f6b5a4eab1f73479a50fb79fcf729514a900c341d8503d62a62dbc4127a2b1 \
# via sphinx
iniparse==0.4 \
--hash=sha256:abc1ee12d2cfb2506109072d6c21e40b6c75a3fe90a9c924327d80bc0d99c054 \
# via -r contrib/packaging/venv_py2/requirements.txt.in
jinja2==2.8 \
--hash=sha256:1cc03ef32b64be19e0a5b54578dd790906a34943fe9102cfdae0d4495bd536b4 \
--hash=sha256:bc1ff2ff88dbfacefde4ddde471d1417d3b304e8df103a7a9437d47269201bf4
--hash=sha256:bc1ff2ff88dbfacefde4ddde471d1417d3b304e8df103a7a9437d47269201bf4 \
# via -r contrib/packaging/venv_py2/requirements_win32.txt.in, sphinx
markupsafe==1.1.1 \
--hash=sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473 \
--hash=sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161 \
......@@ -82,7 +94,7 @@ packaging==20.1 \
pygments==2.5.2 \
--hash=sha256:2a3fe295e54a20164a9df49c75fa58526d3be48e14aceba6d6b1e8ac0bfd6f1b \
--hash=sha256:98c8aa5a9f778fcd1026a17361ddaf7330d1b7c62ae97c3bb0ae73e0b9b6b0fe \
# via sphinx
# via -r contrib/packaging/venv_py2/requirements.txt.in, sphinx
pyparsing==2.4.6 \
--hash=sha256:4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f \
--hash=sha256:c342dccb5250c08d45fd6f8b4a559613ca603b57498511740e65cd11a2e7dcec \
......@@ -103,7 +115,8 @@ pywin32==227 \
--hash=sha256:a929a4af626e530383a579431b70e512e736e9588106715215bf685a3ea508d4 \
--hash=sha256:c054c52ba46e7eb6b7d7dfae4dbd987a1bb48ee86debe3f245a2884ece46e295 \
--hash=sha256:f27cec5e7f588c3d1051651830ecc00294f90728d19c3bf6916e6dba93ea357c \
--hash=sha256:f4c5be1a293bae0076d93c88f37ee8da68136744588bc5e2be2f299a34ceb7aa
--hash=sha256:f4c5be1a293bae0076d93c88f37ee8da68136744588bc5e2be2f299a34ceb7aa \
# via -r contrib/packaging/venv_py2/requirements_win32.txt.in
requests==2.22.0 \
--hash=sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 \
--hash=sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 \
......@@ -118,7 +131,8 @@ snowballstemmer==2.0.0 \
# via sphinx
sphinx==1.7.4 \
--hash=sha256:2e7ad92e96eff1b2006cf9f0cdb2743dacbae63755458594e9e8238b0c3dc60b \
--hash=sha256:e9b1a75a3eae05dded19c80eb17325be675e0698975baae976df603b6ed1eb10
--hash=sha256:e9b1a75a3eae05dded19c80eb17325be675e0698975baae976df603b6ed1eb10 \
# via -r contrib/packaging/venv_py2/requirements_win32.txt.in
sphinxcontrib-websupport==1.1.2 \
--hash=sha256:1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc \
--hash=sha256:e02f717baf02d0b6c3dd62cf81232ffca4c9d5c331e03766982e3ff9f1d2bc3f \
......
......@@ -2,10 +2,61 @@
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --generate-hashes --output-file=contrib/packaging/venv_py3/requirements_win32.txt contrib/packaging/venv_py3/requirements_win32.txt.in
# pip-compile --generate-hashes --output-file=contrib/packaging/venv_py3/requirements_win32.txt contrib/packaging/venv_py3/requirements.txt.in contrib/packaging/venv_py3/requirements_win32.txt.in
#
comtypes==1.1.7 \
--hash=sha256:c9d59f57d559613940f22da54d70add066faa23b4fa9b5cd95facdc501a63b0b
--hash=sha256:c9d59f57d559613940f22da54d70add066faa23b4fa9b5cd95facdc501a63b0b \
# via -r contrib/packaging/venv_py3/requirements_win32.txt.in
iniparse==0.5 \
--hash=sha256:88ca60473b1637055a937933d48840be1b1b6835f381a6158ef118a532583675 \
--hash=sha256:932e5239d526e7acb504017bb707be67019ac428a6932368e6851691093aa842 \
--hash=sha256:db6ef1d8a02395448e0e7b17ac0aa28b8d338b632bbd1ffca08c02ddae32cf97 \
# via -r contrib/packaging/venv_py3/requirements.txt.in
mercurial==5.6 \
--hash=sha256:1070bf3d172772f0dc1dc68496ba69beb1f471c7acf6e3de3ac26e1a353ad57b \
--hash=sha256:15962f925e942636e63af4d0d522fbf2c6f0d58ce2a6731ce58b9772656489f5 \
--hash=sha256:39832fe21e66a00cd7c72013c6f170b4a6faf8e9d0e4f588770346732ff77e35 \
--hash=sha256:3d397fa00a1f26ac286a47c9d5349ef637f886737a5ffba674ce0c2f6ee05af2 \
--hash=sha256:8f98d1dd06eb003df76b7d433bd1a828013449395c8613066b0dda913e77953e \
--hash=sha256:98ea50b331059c662cb25647151b57e65659252796feced10294373ecfd189fe \
--hash=sha256:dfa7b3b5082783763710504f242ec487a5d801dc4bcd701cdad4b6ffc1f062c2 \
--hash=sha256:dfe66e3b1ca33f0397ab4bcb6c80c3c1c787b62c390e06e2b933e67d06fe5d92 \
--hash=sha256:fd9589367966ade047e7140807c8d7a85bd9f983fc747d2fca1ce6430f902c5a \
# via -r contrib/packaging/venv_py3/requirements.txt.in
pygments==2.7.2 \
--hash=sha256:381985fcc551eb9d37c52088a32914e00517e57f4a21609f48141ba08e193fa0 \
--hash=sha256:88a0bbcd659fcb9573703957c6b9cff9fab7295e6e76db54c9d00ae42df32773 \
# via -r contrib/packaging/venv_py3/requirements.txt.in
pyqt5-sip==12.8.1 \
--hash=sha256:0304ca9114b9817a270f67f421355075b78ff9fc25ac58ffd72c2601109d2194 \
--hash=sha256:0cd969be528c27bbd4755bd323dff4a79a8fdda28215364e6ce3e069cb56c2a9 \
--hash=sha256:2f35e82fd7ec1e1f6716e9154721c7594956a4f5bd4f826d8c6a6453833cc2f0 \
--hash=sha256:30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd \
--hash=sha256:34dcd29be47553d5f016ff86e89e24cbc5eebae92eb2f96fb32d2d7ba028c43c \
--hash=sha256:5a011aeff89660622a6d5c3388d55a9d76932f3b82c95e82fc31abd8b1d2990d \
--hash=sha256:6c1ebee60f1d2b3c70aff866b7933d8d8d7646011f7c32f9321ee88c290aa4f9 \
--hash=sha256:7b81382ce188d63890a0e35abe0f9bb946cabc873a31873b73583b0fc84ac115 \
--hash=sha256:832fd60a264de4134c2824d393320838f3ab648180c9c357ec58a74524d24507 \
--hash=sha256:84ba7746762bd223bed22428e8561aa267a229c28344c2d28c5d5d3f8970cffb \
--hash=sha256:9312ec47cac4e33c11503bc1cbeeb0bdae619620472f38e2078c5a51020a930f \
--hash=sha256:a1b8ef013086e224b8e86c93f880f776d01b59195bdfa2a8e0b23f0480678fec \
--hash=sha256:a29e2ac399429d3b7738f73e9081e50783e61ac5d29344e0802d0dcd6056c5a2 \
--hash=sha256:b6d42250baec52a5f77de64e2951d001c5501c3a2df2179f625b241cbaec3369 \
--hash=sha256:bb5a87b66fc1445915104ee97f7a20a69decb42f52803e3b0795fa17ff88226c \
--hash=sha256:c317ab1263e6417c498b81f5c970a9b1af7acefab1f80b4cc0f2f8e661f29fc5 \
--hash=sha256:c9800729badcb247765e4ffe2241549d02da1fa435b9db224845bc37c3e99cb0 \
--hash=sha256:c9d6d448c29dc6606bb7974696608f81f4316c8234f7c7216396ed110075e777 \
--hash=sha256:da9c9f1e65b9d09e73bd75befc82961b6b61b5a3b9d0a7c832168e1415f163c6 \
--hash=sha256:ed897c58acf4a3cdca61469daa31fe6e44c33c6c06a37c3f21fab31780b3b86a \
--hash=sha256:f168f0a7f32b81bfeffdf003c36f25d81c97dee5eb67072a5183e761fe250f13 \
# via pyqt5, qscintilla
pyqt5==5.15.1 \
--hash=sha256:17a6d5258796bae16e447aa3efa00258425c09cf88ef68238762628a5dde7c6f \
--hash=sha256:4e47021c2b8e89a3bc64247dfb224144e5c8d77e3ab44f3842d120aab6b3cbd4 \
--hash=sha256:b1ea7e82004dc7b311d1e29df2f276461016e2d180e10c73805ace4376125ed9 \
--hash=sha256:b9e7cc3ec69f80834f3f7507478c77e4d42411d5e9e557350e61b2660d12abc2 \
--hash=sha256:d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1 \
# via -r contrib/packaging/venv_py3/requirements.txt.in, qscintilla
pywin32==227 \
--hash=sha256:300a2db938e98c3e7e2093e4491439e62287d0d493fe07cce110db070b54c0be \
--hash=sha256:31f88a89139cb2adc40f8f0e65ee56a8c585f629974f9e07622ba80199057511 \
......@@ -18,4 +69,15 @@ pywin32==227 \
--hash=sha256:a929a4af626e530383a579431b70e512e736e9588106715215bf685a3ea508d4 \
--hash=sha256:c054c52ba46e7eb6b7d7dfae4dbd987a1bb48ee86debe3f245a2884ece46e295 \
--hash=sha256:f27cec5e7f588c3d1051651830ecc00294f90728d19c3bf6916e6dba93ea357c \
--hash=sha256:f4c5be1a293bae0076d93c88f37ee8da68136744588bc5e2be2f299a34ceb7aa
--hash=sha256:f4c5be1a293bae0076d93c88f37ee8da68136744588bc5e2be2f299a34ceb7aa \
# via -r contrib/packaging/venv_py3/requirements_win32.txt.in
qscintilla==2.11.5 \
--hash=sha256:4cead28183719105c033b6dc67d12159ea0432fbbc175e94bf24ea3120cdfd74 \
--hash=sha256:586fc5710f386f67654217f98a5f450b45b72599ba22622b3da017a6f5e7f4ab \
--hash=sha256:bf7989d2d07e3221ca0b5ca3461d7bbad15ffeb76c973725e39a85adb551ca13 \
--hash=sha256:d50e8ba3beb28565223b3d33a340e24ca8a4340e705f2dce854da090a53394f6 \
# via -r contrib/packaging/venv_py3/requirements.txt.in
six==1.15.0 \
--hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \
--hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced \
# via iniparse
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment