mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 03:26:50 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[python3] Update to 3.9.6 (#18754)

Browse Source 
* [python3] Bump to 3.9.6

* x-add-version

* Update all tools to Python 3.9.6.
This commit is contained in:
Adam Johnson 2021-07-13 16:13:06 -04:00 committed by GitHub
parent 675adc7e85
commit a66098ad1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/python3/portfile.cmake
View File

@ -5,7 +5,7 @@ endif()
set(PYTHON_VERSION_MAJOR 3) set(PYTHON_VERSION_MAJOR 3)
set(PYTHON_VERSION_MINOR 9) set(PYTHON_VERSION_MINOR 9)
set(PYTHON_VERSION_PATCH 5) set(PYTHON_VERSION_PATCH 6)
set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH})
set(PATCHES set(PATCHES
@ -32,7 +32,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO python/cpython REPO python/cpython
REF v${PYTHON_VERSION} REF v${PYTHON_VERSION}
SHA512 6bef5174f133e7eb48ad54d14b07f77500ac2cdcfb397cac9f19ecaaf5334fbcc999f755719883c99c0d173b7b816a2def56537666c20e7b11cb783572fc6e00 SHA512 a484de98044d180c3494ccf199f146516650cf7bc917b7d4a85f1e9b42b3938c2540f82298cb3f59332ae41c927e2335b4d91265de3496db4a14693a25a6a772
HEAD_REF master HEAD_REF master
PATCHES ${PATCHES} PATCHES ${PATCHES}
) )

3
ports/python3/vcpkg.json
View File

@ -1,7 +1,6 @@
{ {
"name": "python3", "name": "python3",
"version-string": "3.9.5", "version-semver": "3.9.6",
"port-version": 1,
"description": "The Python programming language", "description": "The Python programming language",
"homepage": "https://github.com/python/cpython", "homepage": "https://github.com/python/cpython",
"supports": "!(arm | uwp)", "supports": "!(arm | uwp)",

6
scripts/cmake/vcpkg_find_acquire_program.cmake
View File

@ -148,17 +148,17 @@ function(vcpkg_find_acquire_program VAR)
elseif(VAR MATCHES "PYTHON3") elseif(VAR MATCHES "PYTHON3")
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set(PROGNAME python) set(PROGNAME python)
set(PYTHON_VERSION 3.9.5) set(PYTHON_VERSION 3.9.6)
if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
set(SUBDIR "python-${PYTHON_VERSION}-x86") set(SUBDIR "python-${PYTHON_VERSION}-x86")
set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-win32.zip") set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-win32.zip")
set(ARCHIVE "python-${PYTHON_VERSION}-embed-win32.zip") set(ARCHIVE "python-${PYTHON_VERSION}-embed-win32.zip")
set(HASH f0ff0760684f4d91bfe1270438e5dda691ae38a7558500d32b9a763ac9498d3ccac6e843cee5220c5e3dc841863ae3e1af256fa25354f2665cc34dc35fe4c2c7) set(HASH 4b2a0670094e639dcb2b762a02de8cdadd0af3657c463d9ff45af2541c0306496b991ae5402f119443ca891e918685bb57d18f13975f0493d349d864ff3e3a2c)
else() else()
set(SUBDIR "python-${PYTHON_VERSION}-x64") set(SUBDIR "python-${PYTHON_VERSION}-x64")
set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-amd64.zip") set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-amd64.zip")
set(ARCHIVE "python-${PYTHON_VERSION}-embed-amd64.zip") set(ARCHIVE "python-${PYTHON_VERSION}-embed-amd64.zip")
set(HASH 92ba1b50c05c6978af3dde395c66319b181bc8d6cc5921d8f63cac333d574bc7e71ad85331356b79181d4a312a6133c246eaa9da242855e1e75a316487120897) set(HASH f8946471ed7dbc8cbffc72298f99330794b127ce6aa60abc87e80b31bd26099a2f637db85af88ce78c06dcf6e19064184ef3768edf4b1a0f97c25898e379d121)
endif() endif()
set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E rm python39._pth) set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E rm python39._pth)

8
scripts/vcpkgTools.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<tools version="2"> <tools version="2">
<tool name="python3" os="windows"> <tool name="python3" os="windows">
<version>3.9.5</version> <version>3.9.6</version>
<exeRelativePath>python.exe</exeRelativePath> <exeRelativePath>python.exe</exeRelativePath>
<url>https://www.python.org/ftp/python/3.9.5/python-3.9.5-embed-win32.zip</url> <url>https://www.python.org/ftp/python/3.9.6/python-3.9.6-embed-win32.zip</url>
<sha512>f0ff0760684f4d91bfe1270438e5dda691ae38a7558500d32b9a763ac9498d3ccac6e843cee5220c5e3dc841863ae3e1af256fa25354f2665cc34dc35fe4c2c7</sha512> <sha512>4b2a0670094e639dcb2b762a02de8cdadd0af3657c463d9ff45af2541c0306496b991ae5402f119443ca891e918685bb57d18f13975f0493d349d864ff3e3a2c</sha512>
<archiveName>python-3.9.5-embed-win32.zip</archiveName> <archiveName>python-3.9.6-embed-win32.zip</archiveName>
</tool> </tool>
<tool name="cmake" os="windows"> <tool name="cmake" os="windows">
<version>3.20.2</version> <version>3.20.2</version>

4
versions/baseline.json
View File

@ -5057,8 +5057,8 @@
"port-version": 1 "port-version": 1
}, },
"python3": { "python3": {
"baseline": "3.9.5", "baseline": "3.9.6",
"port-version": 1 "port-version": 0
}, },
"qca": { "qca": {
"baseline": "2.3.1", "baseline": "2.3.1",

5
versions/p-/python3.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "0628d684afd26b15be6a1a6bb162e56744a442a7",
"version-semver": "3.9.6",
"port-version": 0
},
{ {
"git-tree": "0c58aaaa7b980102912bbd8b13ba3ac227b37bd4", "git-tree": "0c58aaaa7b980102912bbd8b13ba3ac227b37bd4",
"version-string": "3.9.5", "version-string": "3.9.5",