From ec316f8fac314d8d02ef40f481cad8df0188eb5e Mon Sep 17 00:00:00 2001 From: David Federman Date: Fri, 10 Dec 2021 13:58:11 -0800 Subject: [PATCH] [python3] Update to 3.10.1 (#21927) --- ports/python3/portfile.cmake | 2 +- ports/python3/vcpkg.json | 3 +-- scripts/cmake/vcpkg_find_acquire_program.cmake | 10 +++++----- scripts/vcpkgTools.xml | 8 ++++---- versions/baseline.json | 4 ++-- versions/p-/python3.json | 5 +++++ 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 822446795c2..bb3d9718789 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -5,7 +5,7 @@ endif() set(PYTHON_VERSION_MAJOR 3) 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(PATCHES diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 37ac1a65006..870f1296a73 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "python3", - "version-semver": "3.10.0", - "port-version": 4, + "version-semver": "3.10.1", "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 285efefe05b..036043462c6 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -247,17 +247,17 @@ function(vcpkg_find_acquire_program program) elseif(program STREQUAL "PYTHON3") if(CMAKE_HOST_WIN32) set(program_name python) - set(program_version 3.10.0) + set(program_version 3.10.1) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "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_filename "python-${program_version}-embed-win32.zip") - set(download_sha512 0b007bfa02cdd48b3c260986493fa124a6b9d794da6eba2b4fad0d779fd655e9ae4e16daf5f02ff5b30a17abcfc1499bc6bee394c0f8abe933f2d4fe702af3cd) + set(download_sha512 47bf00e4de74f33fe3d0c4f97773b221cf78c29f02257f43368f0414c88be1bdffc914e4e6516870c23cba84f4618edb8fe5a3ee43e41f492d812a90d93c1ea8) else() 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_filename "python-${program_version}-embed-amd64.zip") - set(download_sha512 23d81d007698383d8dc088da532dcb86c6ceca7eb78ba5688fc2e18ee7f33f53a5632282873762293b8164556dfb15870f8ffb7abd368faba0a3d8d5d5bc6297) + set(download_sha512 cb67b15c312cf6e157b5023106b52129998f0cc214fc79e53ffa8b7ef9f34200690d9ab6798401c47be4e6c22bfbfcb3c0fd17e71d9253c53d4572b1d4931029) endif() set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") 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(raw_executable ON) 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(search_names meson meson.py) set(interpreter PYTHON3) @@ -360,7 +360,7 @@ function(vcpkg_find_acquire_program program) if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt") file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/meson/version.txt" program_version) set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/meson") - else() # Old behavior + else() # Old behavior set(program_version 0.58.1) set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0) set(paths_to_search "${DOWNLOADS}/tools/meson/meson-${ref}") diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 2b66b76a121..c2d59ec5f60 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,11 +1,11 @@ - 3.10.0 + 3.10.1 python.exe - https://www.python.org/ftp/python/3.10.0/python-3.10.0-embed-win32.zip - 0b007bfa02cdd48b3c260986493fa124a6b9d794da6eba2b4fad0d779fd655e9ae4e16daf5f02ff5b30a17abcfc1499bc6bee394c0f8abe933f2d4fe702af3cd - python-3.10.0-embed-win32.zip + https://www.python.org/ftp/python/3.10.1/python-3.10.1-embed-win32.zip + 47bf00e4de74f33fe3d0c4f97773b221cf78c29f02257f43368f0414c88be1bdffc914e4e6516870c23cba84f4618edb8fe5a3ee43e41f492d812a90d93c1ea8 + python-3.10.1-embed-win32.zip 3.21.1 diff --git a/versions/baseline.json b/versions/baseline.json index b8d45c66099..08de0a4e629 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5473,8 +5473,8 @@ "port-version": 1 }, "python3": { - "baseline": "3.10.0", - "port-version": 4 + "baseline": "3.10.1", + "port-version": 0 }, "qca": { "baseline": "2.3.4", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index bbdd9a2ab4c..264cebec33e 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5808a65bfe083729207ce88e66204198e3d939c", + "version-semver": "3.10.1", + "port-version": 0 + }, { "git-tree": "4fc95c5f7429e4fa04ba978f79ae6530f5280749", "version-semver": "3.10.0",