From b1989c1060dad2c706beda684a569f0dda9726f4 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 6 Jun 2022 21:15:02 -0400 Subject: [PATCH 1/4] [python3] Update to current --- ports/python3/portfile.cmake | 4 ++-- ports/python3/vcpkg.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 144fd4b002835c..9c4b0076aa15d8 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 2) +set(PYTHON_VERSION_PATCH 5) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) set(PATCHES @@ -42,7 +42,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} - SHA512 14f0d1847d4361fa075adbe4dbf7339fb62be91d5419cf506abdf46b36dc5273564792d35e5a5e0608a8fa877a870152a593743c3b70a98c739d5bd028be9e18 + SHA512 7a736c6bf76735f66eba50bc055661c46fefce1496869c51e9b6b264bca456d2f2c6de293dfc3bc15a9d1df4b633d7f6f66ed86696e71a36e500354a75f4200f HEAD_REF master PATCHES ${PATCHES} ) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 21ee84f93dc8bd..61714a805f4476 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "python3", - "version": "3.10.2", - "port-version": 2, + "version": "3.10.5", "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", From df9c2fb5e8a26075372ce5aa801e1f9b67a65a05 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 6 Jun 2022 21:15:44 -0400 Subject: [PATCH 2/4] update versions to current --- versions/baseline.json | 4 ++-- versions/p-/python3.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 772478c7fb447a..1ad392df6fcd78 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5681,8 +5681,8 @@ "port-version": 5 }, "python3": { - "baseline": "3.10.2", - "port-version": 2 + "baseline": "3.10.5", + "port-version": 0 }, "qca": { "baseline": "2.3.4", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 36df2f98ae49d1..006ac77139aafe 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7c43b7217707bb35a86859d9285496fc2bce8e2", + "version": "3.10.5", + "port-version": 0 + }, { "git-tree": "30321893b72abb4b682e3b66f75c54c1df3051c9", "version": "3.10.2", From 48ef3d804980469c8b07a61c65722726e04c31f1 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Mon, 6 Jun 2022 21:35:48 -0400 Subject: [PATCH 3/4] [vfap] update python3 to current --- scripts/cmake/vcpkg_find_acquire_program.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index cefcfb4be88041..fd96bd70108c6e 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -224,17 +224,17 @@ function(vcpkg_find_acquire_program program) elseif(program STREQUAL "PYTHON3") if(CMAKE_HOST_WIN32) set(program_name python) - set(program_version 3.10.2) + set(program_version 3.10.5) 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 d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9) + set(download_sha512 7598cf838401d87c4aadb43f1d70a66c647b5c4c86d55eed747126eb21e699ee8e662eef50782eabe10c746ae3947a7f1418fa9e2c1131ca8f3ed06dcb48b00f) 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 e04e14f3b5e96f120a3b0d5fac07b2982b9f3394aef4591b140e84ff97c8532e1f8bf3e613bdf5aec6afeac108b975e754bf9727354bcfaa6673fc89826eac37) + set(download_sha512 17b1e00af8a051a4d319dd4bf340a6ad742c1b691faa30ea9f51bc0f2e9daccccd2745e2a081699428981d120d0c06007878ecaafca78936f4cfcab0054b4fb7) endif() set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth) From 0e9802658e39ae63beb6e79beccd7a36d5a6d3c3 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 7 Jun 2022 19:50:22 -0400 Subject: [PATCH 4/4] update vcpkgTools.xml --- scripts/vcpkgTools.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 5c21091aeb64b1..1dd3699a5b6fbe 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,18 +1,18 @@ - 3.10.2 + 3.10.5 python.exe - https://www.python.org/ftp/python/3.10.2/python-3.10.2-embed-win32.zip - d647d7141d1b13c899671b882e686a1b1cc6f759e5b7428ec858cdffd9ef019c78fb0b989174b98f30cb696297bfeff3d171f7eaabb339f5154886c030b8e4d9 - python-3.10.2-embed-win32.zip + https://www.python.org/ftp/python/3.10.5/python-3.10.5-embed-win32.zip + 7598cf838401d87c4aadb43f1d70a66c647b5c4c86d55eed747126eb21e699ee8e662eef50782eabe10c746ae3947a7f1418fa9e2c1131ca8f3ed06dcb48b00f + python-3.10.5-embed-win32.zip - 3.10.2 + 3.10.5 tools\python.exe - https://www.nuget.org/api/v2/package/python/3.10.2 - eb94c254e669eb22aad276c6cc6eec7ae6c19dacfa7d29b0b980953717f4c73a52e0f37807dfe925ecefd1b04b1f78bf0095b03e578a4b6405e52c640e4ab4c5 - python-3.10.2.nupkg.zip + https://www.nuget.org/api/v2/package/python/3.10.5 + be225985a23b685939ff6cb134fbe29b8fd6683cd6695753fc10ef4784dcc412fc98aa2dedca902cf0be5393dfd97724ea88331cda1bcd4b86a839e9d699de7d + python-3.10.5.nupkg.zip 3.22.2