Show More
@@ -158,7 +158,7 b' def build_all_windows_packages(' | |||||
158 |
|
158 | |||
159 | windows.synchronize_hg(SOURCE_ROOT, revision, instance) |
|
159 | windows.synchronize_hg(SOURCE_ROOT, revision, instance) | |
160 |
|
160 | |||
161 | for py_version in ("2.7", "3.7", "3.8", "3.9"): |
|
161 | for py_version in ("2.7", "3.7", "3.8", "3.9", "3.10"): | |
162 | for arch in ("x86", "x64"): |
|
162 | for arch in ("x86", "x64"): | |
163 | windows.purge_hg(winrm_client) |
|
163 | windows.purge_hg(winrm_client) | |
164 | windows.build_wheel( |
|
164 | windows.build_wheel( | |
@@ -377,7 +377,7 b' def get_parser():' | |||||
377 | sp.add_argument( |
|
377 | sp.add_argument( | |
378 | '--python-version', |
|
378 | '--python-version', | |
379 | help='Python version to build for', |
|
379 | help='Python version to build for', | |
380 | choices={'2.7', '3.7', '3.8', '3.9'}, |
|
380 | choices={'2.7', '3.7', '3.8', '3.9', '3.10'}, | |
381 | nargs='*', |
|
381 | nargs='*', | |
382 | default=['3.8'], |
|
382 | default=['3.8'], | |
383 | ) |
|
383 | ) | |
@@ -501,7 +501,7 b' def get_parser():' | |||||
501 | sp.add_argument( |
|
501 | sp.add_argument( | |
502 | '--python-version', |
|
502 | '--python-version', | |
503 | help='Python version to use', |
|
503 | help='Python version to use', | |
504 | choices={'2.7', '3.5', '3.6', '3.7', '3.8', '3.9'}, |
|
504 | choices={'2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10'}, | |
505 | default='2.7', |
|
505 | default='2.7', | |
506 | ) |
|
506 | ) | |
507 | sp.add_argument( |
|
507 | sp.add_argument( |
@@ -129,6 +129,8 b" WHEEL_FILENAME_PYTHON38_X86 = 'mercurial" | |||||
129 | WHEEL_FILENAME_PYTHON38_X64 = 'mercurial-{version}-cp38-cp38-win_amd64.whl' |
|
129 | WHEEL_FILENAME_PYTHON38_X64 = 'mercurial-{version}-cp38-cp38-win_amd64.whl' | |
130 | WHEEL_FILENAME_PYTHON39_X86 = 'mercurial-{version}-cp39-cp39-win32.whl' |
|
130 | WHEEL_FILENAME_PYTHON39_X86 = 'mercurial-{version}-cp39-cp39-win32.whl' | |
131 | WHEEL_FILENAME_PYTHON39_X64 = 'mercurial-{version}-cp39-cp39-win_amd64.whl' |
|
131 | WHEEL_FILENAME_PYTHON39_X64 = 'mercurial-{version}-cp39-cp39-win_amd64.whl' | |
|
132 | WHEEL_FILENAME_PYTHON310_X86 = 'mercurial-{version}-cp310-cp310-win32.whl' | |||
|
133 | WHEEL_FILENAME_PYTHON310_X64 = 'mercurial-{version}-cp310-cp310-win_amd64.whl' | |||
132 |
|
134 | |||
133 | EXE_FILENAME_PYTHON2_X86 = 'Mercurial-{version}-x86-python2.exe' |
|
135 | EXE_FILENAME_PYTHON2_X86 = 'Mercurial-{version}-x86-python2.exe' | |
134 | EXE_FILENAME_PYTHON2_X64 = 'Mercurial-{version}-x64-python2.exe' |
|
136 | EXE_FILENAME_PYTHON2_X64 = 'Mercurial-{version}-x64-python2.exe' | |
@@ -480,6 +482,8 b' def resolve_wheel_artifacts(dist_path: p' | |||||
480 | dist_path / WHEEL_FILENAME_PYTHON38_X64.format(version=version), |
|
482 | dist_path / WHEEL_FILENAME_PYTHON38_X64.format(version=version), | |
481 | dist_path / WHEEL_FILENAME_PYTHON39_X86.format(version=version), |
|
483 | dist_path / WHEEL_FILENAME_PYTHON39_X86.format(version=version), | |
482 | dist_path / WHEEL_FILENAME_PYTHON39_X64.format(version=version), |
|
484 | dist_path / WHEEL_FILENAME_PYTHON39_X64.format(version=version), | |
|
485 | dist_path / WHEEL_FILENAME_PYTHON310_X86.format(version=version), | |||
|
486 | dist_path / WHEEL_FILENAME_PYTHON310_X64.format(version=version), | |||
483 | ) |
|
487 | ) | |
484 |
|
488 | |||
485 |
|
489 | |||
@@ -493,6 +497,8 b' def resolve_all_artifacts(dist_path: pat' | |||||
493 | dist_path / WHEEL_FILENAME_PYTHON38_X64.format(version=version), |
|
497 | dist_path / WHEEL_FILENAME_PYTHON38_X64.format(version=version), | |
494 | dist_path / WHEEL_FILENAME_PYTHON39_X86.format(version=version), |
|
498 | dist_path / WHEEL_FILENAME_PYTHON39_X86.format(version=version), | |
495 | dist_path / WHEEL_FILENAME_PYTHON39_X64.format(version=version), |
|
499 | dist_path / WHEEL_FILENAME_PYTHON39_X64.format(version=version), | |
|
500 | dist_path / WHEEL_FILENAME_PYTHON310_X86.format(version=version), | |||
|
501 | dist_path / WHEEL_FILENAME_PYTHON310_X64.format(version=version), | |||
496 | dist_path / EXE_FILENAME_PYTHON2_X86.format(version=version), |
|
502 | dist_path / EXE_FILENAME_PYTHON2_X86.format(version=version), | |
497 | dist_path / EXE_FILENAME_PYTHON2_X64.format(version=version), |
|
503 | dist_path / EXE_FILENAME_PYTHON2_X64.format(version=version), | |
498 | dist_path / EXE_FILENAME_PYTHON3_X86.format(version=version), |
|
504 | dist_path / EXE_FILENAME_PYTHON3_X86.format(version=version), |
@@ -34,6 +34,11 b'' | |||||
34 | $PYTHON39_X64_URL = "https://www.python.org/ftp/python/3.9.9/python-3.9.9-amd64.exe" |
|
34 | $PYTHON39_X64_URL = "https://www.python.org/ftp/python/3.9.9/python-3.9.9-amd64.exe" | |
35 | $PYTHON39_x64_SHA256 = "137d59e5c0b01a8f1bdcba08344402ae658c81c6bf03b6602bd8b4e951ad0714" |
|
35 | $PYTHON39_x64_SHA256 = "137d59e5c0b01a8f1bdcba08344402ae658c81c6bf03b6602bd8b4e951ad0714" | |
36 |
|
36 | |||
|
37 | $PYTHON310_x86_URL = "https://www.python.org/ftp/python/3.10.0/python-3.10.0.exe" | |||
|
38 | $PYTHON310_x86_SHA256 = "ea896eeefb1db9e12fb89ec77a6e28c9fe52b4a162a34c85d9688be2ec2392e8" | |||
|
39 | $PYTHON310_X64_URL = "https://www.python.org/ftp/python/3.10.0/python-3.10.0-amd64.exe" | |||
|
40 | $PYTHON310_x64_SHA256 = "cb580eb7dc55f9198e650f016645023e8b2224cf7d033857d12880b46c5c94ef" | |||
|
41 | ||||
37 | # PIP 19.2.3. |
|
42 | # PIP 19.2.3. | |
38 | $PIP_URL = "https://github.com/pypa/get-pip/raw/309a56c5fd94bd1134053a541cb4657a4e47e09d/get-pip.py" |
|
43 | $PIP_URL = "https://github.com/pypa/get-pip/raw/309a56c5fd94bd1134053a541cb4657a4e47e09d/get-pip.py" | |
39 | $PIP_SHA256 = "57e3643ff19f018f8a00dfaa6b7e4620e3c1a7a2171fd218425366ec006b3bfe" |
|
44 | $PIP_SHA256 = "57e3643ff19f018f8a00dfaa6b7e4620e3c1a7a2171fd218425366ec006b3bfe" | |
@@ -132,6 +137,8 b' function Install-Dependencies($prefix) {' | |||||
132 | Secure-Download $PYTHON38_x64_URL ${prefix}\assets\python38-x64.exe $PYTHON38_x64_SHA256 |
|
137 | Secure-Download $PYTHON38_x64_URL ${prefix}\assets\python38-x64.exe $PYTHON38_x64_SHA256 | |
133 | Secure-Download $PYTHON39_x86_URL ${prefix}\assets\python39-x86.exe $PYTHON39_x86_SHA256 |
|
138 | Secure-Download $PYTHON39_x86_URL ${prefix}\assets\python39-x86.exe $PYTHON39_x86_SHA256 | |
134 | Secure-Download $PYTHON39_x64_URL ${prefix}\assets\python39-x64.exe $PYTHON39_x64_SHA256 |
|
139 | Secure-Download $PYTHON39_x64_URL ${prefix}\assets\python39-x64.exe $PYTHON39_x64_SHA256 | |
|
140 | Secure-Download $PYTHON310_x86_URL ${prefix}\assets\python310-x86.exe $PYTHON310_x86_SHA256 | |||
|
141 | Secure-Download $PYTHON310_x64_URL ${prefix}\assets\python310-x64.exe $PYTHON310_x64_SHA256 | |||
135 | Secure-Download $PIP_URL ${pip} $PIP_SHA256 |
|
142 | Secure-Download $PIP_URL ${pip} $PIP_SHA256 | |
136 | Secure-Download $VS_BUILD_TOOLS_URL ${prefix}\assets\vs_buildtools.exe $VS_BUILD_TOOLS_SHA256 |
|
143 | Secure-Download $VS_BUILD_TOOLS_URL ${prefix}\assets\vs_buildtools.exe $VS_BUILD_TOOLS_SHA256 | |
137 | Secure-Download $INNO_SETUP_URL ${prefix}\assets\InnoSetup.exe $INNO_SETUP_SHA256 |
|
144 | Secure-Download $INNO_SETUP_URL ${prefix}\assets\InnoSetup.exe $INNO_SETUP_SHA256 | |
@@ -146,6 +153,8 b' function Install-Dependencies($prefix) {' | |||||
146 | # Install-Python3 "Python 3.8 64-bit" ${prefix}\assets\python38-x64.exe ${prefix}\python38-x64 ${pip} |
|
153 | # Install-Python3 "Python 3.8 64-bit" ${prefix}\assets\python38-x64.exe ${prefix}\python38-x64 ${pip} | |
147 | Install-Python3 "Python 3.9 32-bit" ${prefix}\assets\python39-x86.exe ${prefix}\python39-x86 ${pip} |
|
154 | Install-Python3 "Python 3.9 32-bit" ${prefix}\assets\python39-x86.exe ${prefix}\python39-x86 ${pip} | |
148 | Install-Python3 "Python 3.9 64-bit" ${prefix}\assets\python39-x64.exe ${prefix}\python39-x64 ${pip} |
|
155 | Install-Python3 "Python 3.9 64-bit" ${prefix}\assets\python39-x64.exe ${prefix}\python39-x64 ${pip} | |
|
156 | Install-Python3 "Python 3.10 32-bit" ${prefix}\assets\python310-x86.exe ${prefix}\python310-x86 ${pip} | |||
|
157 | Install-Python3 "Python 3.10 64-bit" ${prefix}\assets\python310-x64.exe ${prefix}\python310-x64 ${pip} | |||
149 |
|
158 | |||
150 | Write-Output "installing Visual Studio 2017 Build Tools and SDKs" |
|
159 | Write-Output "installing Visual Studio 2017 Build Tools and SDKs" | |
151 | Invoke-Process ${prefix}\assets\vs_buildtools.exe "--quiet --wait --norestart --nocache --channelUri https://aka.ms/vs/15/release/channel --add Microsoft.VisualStudio.Workload.MSBuildTools --add Microsoft.VisualStudio.Component.Windows10SDK.17763 --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.Windows10SDK --add Microsoft.VisualStudio.Component.VC.140" |
|
160 | Invoke-Process ${prefix}\assets\vs_buildtools.exe "--quiet --wait --norestart --nocache --channelUri https://aka.ms/vs/15/release/channel --add Microsoft.VisualStudio.Workload.MSBuildTools --add Microsoft.VisualStudio.Component.Windows10SDK.17763 --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.Windows10SDK --add Microsoft.VisualStudio.Component.VC.140" |
General Comments 0
You need to be logged in to leave comments.
Login now