Skip to content

[python3] Update to 3.10.5. #25105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 4 commits into from
Jun 17, 2022
Merged

[python3] Update to 3.10.5. #25105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b1989c1
[python3] Update to current
Hoikas Jun 7, 2022
df9c2fb
update versions to current
Hoikas Jun 7, 2022
48ef3d8
[vfap] update python3 to current
Hoikas Jun 7, 2022
0e98026
update vcpkgTools.xml
Hoikas Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/python3/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
)
Expand Down
3 changes: 1 addition & 2 deletions ports/python3/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 3 additions & 3 deletions scripts/cmake/vcpkg_find_acquire_program.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 8 additions & 8 deletions scripts/vcpkgTools.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0"?>
<tools version="2">
<tool name="python3" os="windows">
<version>3.10.2</version>
<version>3.10.5</version>
<exeRelativePath>python.exe</exeRelativePath>
<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>
<url>https://www.python.org/ftp/python/3.10.5/python-3.10.5-embed-win32.zip</url>
<sha512>7598cf838401d87c4aadb43f1d70a66c647b5c4c86d55eed747126eb21e699ee8e662eef50782eabe10c746ae3947a7f1418fa9e2c1131ca8f3ed06dcb48b00f</sha512>
<archiveName>python-3.10.5-embed-win32.zip</archiveName>
</tool>
<tool name="python3_with_venv" os="windows">
<version>3.10.2</version>
<version>3.10.5</version>
<exeRelativePath>tools\python.exe</exeRelativePath>
<url>https://www.nuget.org/api/v2/package/python/3.10.2</url>
<sha512>eb94c254e669eb22aad276c6cc6eec7ae6c19dacfa7d29b0b980953717f4c73a52e0f37807dfe925ecefd1b04b1f78bf0095b03e578a4b6405e52c640e4ab4c5</sha512>
<archiveName>python-3.10.2.nupkg.zip</archiveName>
<url>https://www.nuget.org/api/v2/package/python/3.10.5</url>
<sha512>be225985a23b685939ff6cb134fbe29b8fd6683cd6695753fc10ef4784dcc412fc98aa2dedca902cf0be5393dfd97724ea88331cda1bcd4b86a839e9d699de7d</sha512>
<archiveName>python-3.10.5.nupkg.zip</archiveName>
</tool>
<tool name="cmake" os="windows">
<version>3.22.2</version>
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/python3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d7c43b7217707bb35a86859d9285496fc2bce8e2",
"version": "3.10.5",
"port-version": 0
},
{
"git-tree": "30321893b72abb4b682e3b66f75c54c1df3051c9",
"version": "3.10.2",
Expand Down