aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Johnson <AdamJohnso@gmail.com>2021-02-24 17:01:02 -0500
committerGitHub <noreply@github.com>2021-02-24 14:01:02 -0800
commit0daf0111b29615f6a12f346e5231a122448182b3 (patch)
treed053292ccaad52adfe59b3292bc5466134589832
parentc8116498e44b0b4838646f24af845d236132014a (diff)
downloadvcpkg-0daf0111b29615f6a12f346e5231a122448182b3.tar.gz
vcpkg-0daf0111b29615f6a12f346e5231a122448182b3.zip
[python3] upgrade to 3.9.2 (#16315)
* [python3] Update to 3.9.2. * x-add-version
-rw-r--r--ports/python3/portfile.cmake4
-rw-r--r--ports/python3/vcpkg.json3
-rw-r--r--scripts/cmake/vcpkg_find_acquire_program.cmake6
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/p-/python3.json5
5 files changed, 13 insertions, 9 deletions
diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake
index 72b4ee3bd..ee19476cf 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 0)
+set(PYTHON_VERSION_PATCH 2)
set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH})
set(PATCHES
@@ -23,7 +23,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO python/cpython
REF v${PYTHON_VERSION}
- SHA512 39d304cae181674c4872c63768c0e5aeace2c92eb6d5ea550428d65c8571bc60922b3a3d484b51c46b466aadb7e27500559cafec13a489b48613bbb3fe6a5a5d
+ SHA512 f13c7e50d2c7c00e67b801b0bbb6ab6a8b6bd16c706b3bdd9d2186de3830f0043d0b95d7993d65a169adc9097738906c07727f0df49cd2fb2916bdf0456896b6
HEAD_REF master
PATCHES ${PATCHES}
)
diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json
index d89136da3..0a0b7778f 100644
--- a/ports/python3/vcpkg.json
+++ b/ports/python3/vcpkg.json
@@ -1,7 +1,6 @@
{
"name": "python3",
- "version-string": "3.9.0",
- "port-version": 3,
+ "version-string": "3.9.2",
"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 96b59c5c6..dc8fb668e 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -149,17 +149,17 @@ function(vcpkg_find_acquire_program VAR)
elseif(VAR MATCHES "PYTHON3")
if(CMAKE_HOST_WIN32)
set(PROGNAME python)
- set(PYTHON_VERSION 3.9.0)
+ set(PYTHON_VERSION 3.9.2)
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 1501ad0b3ed1053466bef303e639c4d5cd9c270beacd07d70fb631db15503ea9e1f9de054cafe8759403e77aa898cd8b8878bf9024add4c081b28a4c5a9947ed)
+ set(HASH d792c6179887120ec3e945764b95ae8187032e1779f327feb90ded40ebd39cb78d000056df947f28c9e4257b60dd95ee43a3f77f47a1d8878cbe37ebc20f87a3)
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 e969622b74ea79a6adcf41b4d628bd80c9320df2f3d797905872610172838f1ab70d9bb0c70fcf7da396e03c3a73de96fa69a4b212b26f97de0e4f3366accf51)
+ set(HASH 30f36938d264d160136eb7062846924b980b4f8f4373dab4fbc054c764041149f56760370de571be10410363563c5688a3f1f9ac19be5bb40ae914ddbdcb3c62)
endif()
set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR})
set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E rm python39._pth)
diff --git a/versions/baseline.json b/versions/baseline.json
index 2b4be9c17..870929fef 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4789,8 +4789,8 @@
"port-version": 0
},
"python3": {
- "baseline": "3.9.0",
- "port-version": 3
+ "baseline": "3.9.2",
+ "port-version": 0
},
"qca": {
"baseline": "2.3.1",
diff --git a/versions/p-/python3.json b/versions/p-/python3.json
index fa150d4cd..5bb4d4498 100644
--- a/versions/p-/python3.json
+++ b/versions/p-/python3.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "9af42bd2d8ec6a2e8b563c9cb7544ffa7e2f938e",
+ "version-string": "3.9.2",
+ "port-version": 0
+ },
+ {
"git-tree": "b2f9a57528c88d1deef5b695e56edd7a671c97c2",
"version-string": "3.9.0",
"port-version": 3