mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 01:07:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[python3] Update to 3.10.1 (#21927)

Browse Source
This commit is contained in:
David Federman 2021-12-10 13:58:11 -08:00 committed by GitHub
parent 207af1c995
commit ec316f8fac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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 10) set(PYTHON_VERSION_MINOR 10)
set(PYTHON_VERSION_PATCH 0) set(PYTHON_VERSION_PATCH 1)
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

3
ports/python3/vcpkg.json
View File

@ -1,7 +1,6 @@
{ {
"name": "python3", "name": "python3",
"version-semver": "3.10.0", "version-semver": "3.10.1",
"port-version": 4,
"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)",

10
scripts/cmake/vcpkg_find_acquire_program.cmake
View File

@ -247,17 +247,17 @@ function(vcpkg_find_acquire_program program)
elseif(program STREQUAL "PYTHON3") elseif(program STREQUAL "PYTHON3")
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set(program_name python) set(program_name python)
set(program_version 3.10.0) set(program_version 3.10.1)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
set(tool_subdirectory "python-${program_version}-x86") set(tool_subdirectory "python-${program_version}-x86")
set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip") set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip")
set(download_filename "python-${program_version}-embed-win32.zip") set(download_filename "python-${program_version}-embed-win32.zip")
set(download_sha512 0b007bfa02cdd48b3c260986493fa124a6b9d794da6eba2b4fad0d779fd655e9ae4e16daf5f02ff5b30a17abcfc1499bc6bee394c0f8abe933f2d4fe702af3cd) set(download_sha512 47bf00e4de74f33fe3d0c4f97773b221cf78c29f02257f43368f0414c88be1bdffc914e4e6516870c23cba84f4618edb8fe5a3ee43e41f492d812a90d93c1ea8)
else() else()
set(tool_subdirectory "python-${program_version}-x64") set(tool_subdirectory "python-${program_version}-x64")
set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-amd64.zip") set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-amd64.zip")
set(download_filename "python-${program_version}-embed-amd64.zip") set(download_filename "python-${program_version}-embed-amd64.zip")
set(download_sha512 23d81d007698383d8dc088da532dcb86c6ceca7eb78ba5688fc2e18ee7f33f53a5632282873762293b8164556dfb15870f8ffb7abd368faba0a3d8d5d5bc6297) set(download_sha512 cb67b15c312cf6e157b5023106b52129998f0cc214fc79e53ffa8b7ef9f34200690d9ab6798401c47be4e6c22bfbfcb3c0fd17e71d9253c53d4572b1d4931029)
endif() endif()
set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}")
vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth) vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth)
@ -349,7 +349,7 @@ function(vcpkg_find_acquire_program program)
set(download_filename "nuget.5.11.0.exe") set(download_filename "nuget.5.11.0.exe")
set(raw_executable ON) set(raw_executable ON)
set(download_sha512 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7) set(download_sha512 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7)
elseif(program STREQUAL "MESON") # Should always be found! elseif(program STREQUAL "MESON") # Should always be found!
set(program_name meson) set(program_name meson)
set(search_names meson meson.py) set(search_names meson meson.py)
set(interpreter PYTHON3) set(interpreter PYTHON3)
@ -360,7 +360,7 @@ function(vcpkg_find_acquire_program program)
if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt") if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt")
file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt" program_version) file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt" program_version)
set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/meson") set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/meson")
else() # Old behavior else() # Old behavior
set(program_version 0.58.1) set(program_version 0.58.1)
set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0) set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0)
set(paths_to_search "${DOWNLOADS}/tools/meson/meson-${ref}") set(paths_to_search "${DOWNLOADS}/tools/meson/meson-${ref}")

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.10.0</version> <version>3.10.1</version>
<exeRelativePath>python.exe</exeRelativePath> <exeRelativePath>python.exe</exeRelativePath>
<url>https://www.python.org/ftp/python/3.10.0/python-3.10.0-embed-win32.zip</url> <url>https://www.python.org/ftp/python/3.10.1/python-3.10.1-embed-win32.zip</url>
<sha512>0b007bfa02cdd48b3c260986493fa124a6b9d794da6eba2b4fad0d779fd655e9ae4e16daf5f02ff5b30a17abcfc1499bc6bee394c0f8abe933f2d4fe702af3cd</sha512> <sha512>47bf00e4de74f33fe3d0c4f97773b221cf78c29f02257f43368f0414c88be1bdffc914e4e6516870c23cba84f4618edb8fe5a3ee43e41f492d812a90d93c1ea8</sha512>
<archiveName>python-3.10.0-embed-win32.zip</archiveName> <archiveName>python-3.10.1-embed-win32.zip</archiveName>
</tool> </tool>
<tool name="cmake" os="windows"> <tool name="cmake" os="windows">
<version>3.21.1</version> <version>3.21.1</version>

4
versions/baseline.json
View File

@ -5473,8 +5473,8 @@
"port-version": 1 "port-version": 1
}, },
"python3": { "python3": {
"baseline": "3.10.0", "baseline": "3.10.1",
"port-version": 4 "port-version": 0
}, },
"qca": { "qca": {
"baseline": "2.3.4", "baseline": "2.3.4",

5
versions/p-/python3.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "a5808a65bfe083729207ce88e66204198e3d939c",
"version-semver": "3.10.1",
"port-version": 0
},
{ {
"git-tree": "4fc95c5f7429e4fa04ba978f79ae6530f5280749", "git-tree": "4fc95c5f7429e4fa04ba978f79ae6530f5280749",
"version-semver": "3.10.0", "version-semver": "3.10.0",