From 15dab6a7628cb11cc9bea72a5065eeb473099e7c Mon Sep 17 00:00:00 2001
From: Adam Johnson <AdamJohnso@gmail.com>
Date: Wed, 6 Oct 2021 15:53:06 -0400
Subject: [python3] Upgrade to Python 3.10.0 (#20519)

* [python3] Update to Python 3.10.0rc2 (for testing).

* [python3] Revert trivial patch changes.

* [python3] Bump to 3.10.0 final.

* x-add-version

* update python tools to 3.10.0

* [ecm] Add patch from upstream for Python 3.10.

Remove this on the next release.

* x-add-version

* [python3] Add patch to fix static interpreter.

* x-add-version
---
 scripts/cmake/vcpkg_find_acquire_program.cmake | 8 ++++----
 scripts/vcpkgTools.xml                         | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index a75e3c6be..d8b1de614 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -149,20 +149,20 @@ function(vcpkg_find_acquire_program VAR)
   elseif(VAR MATCHES "PYTHON3")
     if(CMAKE_HOST_WIN32)
       set(PROGNAME python)
-      set(PYTHON_VERSION 3.9.7)
+      set(PYTHON_VERSION 3.10.0)
       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 5f12f693c6df68b75f96b797740a156f2dcd471e96e7980a6e297bbfd064467ba2b2cc9d2f450296388402a8a0b716fce1c4a25b94b50615503d528e33fea870)
+        set(HASH 0b007bfa02cdd48b3c260986493fa124a6b9d794da6eba2b4fad0d779fd655e9ae4e16daf5f02ff5b30a17abcfc1499bc6bee394c0f8abe933f2d4fe702af3cd)
       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 482765de165863f86637591d57141930e2c4ca6e210d0c2569bd0e5fe63157966fb44dea0d5adf249ff15ec9c50cb2dddb704c4ea79369d598f348ee5406f160)
+        set(HASH 23d81d007698383d8dc088da532dcb86c6ceca7eb78ba5688fc2e18ee7f33f53a5632282873762293b8164556dfb15870f8ffb7abd368faba0a3d8d5d5bc6297)
       endif()
       set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
-      set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E rm python39._pth)
+      set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E rm python310._pth)
     else()
       set(PROGNAME python3)
       set(BREW_PACKAGE_NAME "python")
diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml
index fc07adeb5..ad691adbb 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.7</version>
+        <version>3.10.0</version>
         <exeRelativePath>python.exe</exeRelativePath>
-        <url>https://www.python.org/ftp/python/3.9.7/python-3.9.7-embed-win32.zip</url>
-        <sha512>5f12f693c6df68b75f96b797740a156f2dcd471e96e7980a6e297bbfd064467ba2b2cc9d2f450296388402a8a0b716fce1c4a25b94b50615503d528e33fea870</sha512>
-        <archiveName>python-3.9.7-embed-win32.zip</archiveName>
+        <url>https://www.python.org/ftp/python/3.10.0/python-3.10.0-embed-win32.zip</url>
+        <sha512>0b007bfa02cdd48b3c260986493fa124a6b9d794da6eba2b4fad0d779fd655e9ae4e16daf5f02ff5b30a17abcfc1499bc6bee394c0f8abe933f2d4fe702af3cd</sha512>
+        <archiveName>python-3.10.0-embed-win32.zip</archiveName>
     </tool>
     <tool name="cmake" os="windows">
         <version>3.21.1</version>
-- 
cgit v1.2.3