[python3] Update to 3.9.6 (#18754)

* [python3] Bump to 3.9.6

* x-add-version

* Update all tools to Python 3.9.6.

6 files changed, 17 insertions, 13 deletions

diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake
index 4ee2b825d..2765b6a19 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  9)
-set(PYTHON_VERSION_PATCH  5)
+set(PYTHON_VERSION_PATCH  6)
 set(PYTHON_VERSION        ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH})
 
 set(PATCHES
@@ -32,7 +32,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO python/cpython
     REF v${PYTHON_VERSION}
-    SHA512 6bef5174f133e7eb48ad54d14b07f77500ac2cdcfb397cac9f19ecaaf5334fbcc999f755719883c99c0d173b7b816a2def56537666c20e7b11cb783572fc6e00
+    SHA512 a484de98044d180c3494ccf199f146516650cf7bc917b7d4a85f1e9b42b3938c2540f82298cb3f59332ae41c927e2335b4d91265de3496db4a14693a25a6a772
     HEAD_REF master
     PATCHES ${PATCHES}
 )
diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json
index 2f562e6c6..84aec1b9a 100644
--- a/ports/python3/vcpkg.json
+++ b/ports/python3/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "python3",
-  "version-string": "3.9.5",
-  "port-version": 1,
+  "version-semver": "3.9.6",
   "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 327bc5fa5..f6157aeba 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -148,17 +148,17 @@ function(vcpkg_find_acquire_program VAR)
   elseif(VAR MATCHES "PYTHON3")
     if(CMAKE_HOST_WIN32)
       set(PROGNAME python)
-      set(PYTHON_VERSION 3.9.5)
+      set(PYTHON_VERSION 3.9.6)
       if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
         set(SUBDIR "python-${PYTHON_VERSION}-x86")
         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(HASH f0ff0760684f4d91bfe1270438e5dda691ae38a7558500d32b9a763ac9498d3ccac6e843cee5220c5e3dc841863ae3e1af256fa25354f2665cc34dc35fe4c2c7)
+        set(HASH 4b2a0670094e639dcb2b762a02de8cdadd0af3657c463d9ff45af2541c0306496b991ae5402f119443ca891e918685bb57d18f13975f0493d349d864ff3e3a2c)
       else()
         set(SUBDIR "python-${PYTHON_VERSION}-x64")
         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(HASH 92ba1b50c05c6978af3dde395c66319b181bc8d6cc5921d8f63cac333d574bc7e71ad85331356b79181d4a312a6133c246eaa9da242855e1e75a316487120897)
+        set(HASH f8946471ed7dbc8cbffc72298f99330794b127ce6aa60abc87e80b31bd26099a2f637db85af88ce78c06dcf6e19064184ef3768edf4b1a0f97c25898e379d121)
       endif()
       set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
       set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E rm python39._pth)
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index 16f6f27fb..4df3264db 100644
--- a/scripts/vcpkgTools.xml
+++ b/scripts/vcpkgTools.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <tools version="2">
     <tool name="python3" os="windows">
-        <version>3.9.5</version>
+        <version>3.9.6</version>
         <exeRelativePath>python.exe</exeRelativePath>
-        <url>https://www.python.org/ftp/python/3.9.5/python-3.9.5-embed-win32.zip</url>
-        <sha512>f0ff0760684f4d91bfe1270438e5dda691ae38a7558500d32b9a763ac9498d3ccac6e843cee5220c5e3dc841863ae3e1af256fa25354f2665cc34dc35fe4c2c7</sha512>
-        <archiveName>python-3.9.5-embed-win32.zip</archiveName>
+        <url>https://www.python.org/ftp/python/3.9.6/python-3.9.6-embed-win32.zip</url>
+        <sha512>4b2a0670094e639dcb2b762a02de8cdadd0af3657c463d9ff45af2541c0306496b991ae5402f119443ca891e918685bb57d18f13975f0493d349d864ff3e3a2c</sha512>
+        <archiveName>python-3.9.6-embed-win32.zip</archiveName>
     </tool>
     <tool name="cmake" os="windows">
         <version>3.20.2</version>
diff --git a/versions/baseline.json b/versions/baseline.json
index 339691058..f3f4ad231 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5057,8 +5057,8 @@
       "port-version": 1
     },
     "python3": {
-      "baseline": "3.9.5",
-      "port-version": 1
+      "baseline": "3.9.6",
+      "port-version": 0
     },
     "qca": {
       "baseline": "2.3.1",
diff --git a/versions/p-/python3.json b/versions/p-/python3.json
index 1cdad20b6..6b75aa7fc 100644
--- a/versions/p-/python3.json
+++ b/versions/p-/python3.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "0628d684afd26b15be6a1a6bb162e56744a442a7",
+      "version-semver": "3.9.6",
+      "port-version": 0
+    },
+    {
       "git-tree": "0c58aaaa7b980102912bbd8b13ba3ac227b37bd4",
       "version-string": "3.9.5",
       "port-version": 1