[python3] Update to Python 3.10.2. (#23156)

* [python3] Update to Python 3.10.2. * Version nonsense * Update Python tool to 3.10.2. * [python3] Update version file * [python3] Update versions again Co-authored-by: Victor Romero <viromer@microsoft.com>
microsoft · Mar 11, 2022 · 89ed56e · 89ed56e
1 parent 183ba0e
commit 89ed56e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git 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  1)
+set(PYTHON_VERSION_PATCH  2)
 set(PYTHON_VERSION        ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH})
 
 set(PATCHES
@@ -40,7 +40,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO python/cpython
     REF v${PYTHON_VERSION}
-    SHA512 23f99b77c7978282d43a6e442811de1d6e8cc9597c6d1143ec65ae986f64805c36a0a033632a4d1a89053a55854904bcf11415d91e2a3b4a5308c4a21de80098
+    SHA512 14f0d1847d4361fa075adbe4dbf7339fb62be91d5419cf506abdf46b36dc5273564792d35e5a5e0608a8fa877a870152a593743c3b70a98c739d5bd028be9e18
     HEAD_REF master
     PATCHES ${PATCHES}
 )

diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "python3",
-  "version-semver": "3.10.1",
-  "port-version": 8,
+  "version-semver": "3.10.2",
   "description": "The Python programming language",
   "homepage": "https://github.com/python/cpython",
   "license": "Python-2.0",

diff --git 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.1)
+            set(program_version 3.10.2)
             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 47bf00e4de74f33fe3d0c4f97773b221cf78c29f02257f43368f0414c88be1bdffc914e4e6516870c23cba84f4618edb8fe5a3ee43e41f492d812a90d93c1ea8)
+                set(download_sha512 d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9)
             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 cb67b15c312cf6e157b5023106b52129998f0cc214fc79e53ffa8b7ef9f34200690d9ab6798401c47be4e6c22bfbfcb3c0fd17e71d9253c53d4572b1d4931029)
+                set(download_sha512 e04e14f3b5e96f120a3b0d5fac07b2982b9f3394aef4591b140e84ff97c8532e1f8bf3e613bdf5aec6afeac108b975e754bf9727354bcfaa6673fc89826eac37)
             endif()
             set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}")
             vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth)

diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
@@ -3,9 +3,9 @@
     <tool name="python3" os="windows">
         <version>3.10.1</version>
         <exeRelativePath>python.exe</exeRelativePath>
-        <url>https://www.python.org/ftp/python/3.10.1/python-3.10.1-embed-win32.zip</url>
-        <sha512>47bf00e4de74f33fe3d0c4f97773b221cf78c29f02257f43368f0414c88be1bdffc914e4e6516870c23cba84f4618edb8fe5a3ee43e41f492d812a90d93c1ea8</sha512>
-        <archiveName>python-3.10.1-embed-win32.zip</archiveName>
+        <url>https://www.python.org/ftp/python/3.10.2/python-3.10.2-embed-win32.zip</url>
+        <sha512>d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9</sha512>
+        <archiveName>python-3.10.2-embed-win32.zip</archiveName>
     </tool>
     <tool name="cmake" os="windows">
         <version>3.22.2</version>

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5569,8 +5569,8 @@
       "port-version": 3
     },
     "python3": {
-      "baseline": "3.10.1",
-      "port-version": 8
+      "baseline": "3.10.2",
+      "port-version": 0
     },
     "qca": {
       "baseline": "2.3.4",

diff --git a/versions/p-/python3.json b/versions/p-/python3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0cf2e0bbf8fd712f82ed1997be82b136f1c13108",
+      "version-semver": "3.10.2",
+      "port-version": 0
+    },
     {
       "git-tree": "ce4fddbb41412be06577c61632e8e9ef0a67901c",
       "version-semver": "3.10.1",