From a0611c8f40f0f5fda030a2995a885f9aaad9028d Mon Sep 17 00:00:00 2001 From: Osyotr Date: Sat, 28 Sep 2024 16:23:03 +0300 Subject: [PATCH 1/2] [python3] Update port to 3.11.10, tools to 3.12.6 --- ports/python3/portfile.cmake | 6 +++--- ports/python3/vcpkg.json | 3 +-- .../vcpkg_find_acquire_program(PYTHON3).cmake | 15 ++++++++++----- scripts/vcpkgTools.xml | 16 ++++++++-------- versions/baseline.json | 4 ++-- versions/p-/python3.json | 5 +++++ 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 19985c80d6ce9e..516b1af7e72ea4 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -72,8 +72,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython - REF v${PYTHON_VERSION} - SHA512 c2ebe72ce53dd2d59750a7b0bdaf15ebb7ecb6f67d2913a457bf5d32bd0f640815f9496f2fa3ebeac0722264d000735d90d3ffaeac2de1f066b7aee994bf9b24 + REF v${VERSION} + SHA512 411f43495943b8aeec287d4339bac6beb6a7224b0844cc4d48188b208fbbbc6404ad031b6e7a3bed0900baf972c4536a54f4da1ab39202f4f405a188ca04ae07 HEAD_REF master PATCHES ${PATCHES} ) @@ -390,4 +390,4 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CURRENT_PA block() set(CURRENT_HOST_INSTALLED_DIR "${CURRENT_PACKAGES_DIR}") vcpkg_get_vcpkg_installed_python(VCPKG_PYTHON3) -endblocK() \ No newline at end of file +endblock() diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 0af7f3bfd83633..fbbb479994de4e 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "python3", - "version": "3.11.8", - "port-version": 4, + "version": "3.11.10", "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake b/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake index cd2d4e4a075675..2d5b3dc8b02726 100644 --- a/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake +++ b/scripts/cmake/vcpkg_find_acquire_program(PYTHON3).cmake @@ -1,6 +1,6 @@ if(CMAKE_HOST_WIN32) set(program_name python) - set(program_version 3.11.8) + set(program_version 3.12.6) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(build_arch $ENV{PROCESSOR_ARCHITEW6432}) else() @@ -10,21 +10,26 @@ if(CMAKE_HOST_WIN32) set(tool_subdirectory "python-${program_version}-arm64") set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-arm64.zip") set(download_filename "python-${program_version}-embed-arm64.zip") - set(download_sha512 42b820e34c4a77fe928e0af395292d804dcbf7e1132cf353ce6ce23435a687ec580f03ccbf3cd94d98c9dc5ac951f8ca64dbd65cded7ef1d675a39d63f8ace8d) + set(download_sha512 AE87B0FDF9FA75C68A9ECF64628474819D19A57B79FB2D9BB1C3265833EE57CCC1C85C4CF696F90B80C7FAA53ADFD35E893886365202A90EEE0B879B29DA9CA1) elseif(build_arch MATCHES "(amd|AMD)64") 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 da5f01e94d3505eebdfd4d2e70d9cf494925199024479cc29ef144567906b2e8ad55a855b199a755318f5fb9a260f21b987a5fc85f31acf631af4b677921251d) + set(download_sha512 43E9EAB6FCE7E62F1BADF478706E3DF7F65A9BB0FDFF2EE01F71C65425ACD8D73E4E0DCC64A6EE59A7D934BE7271A4F0B9FE3E0DA62A5BA636663F628BD7FBD7) else() 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 c88ef02f0860000dbc59361cfe051e3e8dc7d208ed39bb5bc20a3e8b8711b578926e281a11941787ea61b2ef05b945ab3133322dcb85b916f79ac4ada57f6309) + set(download_sha512 1E1BAE458232E336799DDA220366D6BF9F4F54E4FE7E341E287FF9DB773E8D7C3E03004BA820C7DDB04EF1CE93064F002B96CA4E49326D749055E7D5F3C9ED2D) endif() set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") - vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python311._pth) + + # We want to be able to import stuff from outside of this embeddable package. + # https://docs.python.org/3/library/sys_path_init.html#pth-files + string(REGEX MATCH "^3\\.[0-9]+" _python_version_plain "${program_version}") + string(REPLACE "." "" _python_version_plain "${_python_version_plain}") + vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm "python${_python_version_plain}._pth") else() set(program_name python3) set(brew_package_name "python") diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index ef0b6f6175b8e8..632dbe2ebc9283 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,18 +1,18 @@ - 3.11.8 + 3.12.6 python.exe - https://www.python.org/ftp/python/3.11.8/python-3.11.8-embed-win32.zip - c88ef02f0860000dbc59361cfe051e3e8dc7d208ed39bb5bc20a3e8b8711b578926e281a11941787ea61b2ef05b945ab3133322dcb85b916f79ac4ada57f6309 - python-3.11.8-embed-win32.zip + https://www.python.org/ftp/python/3.12.6/python-3.12.6-embed-win32.zip + 1e1bae458232e336799dda220366d6bf9f4f54e4fe7e341e287ff9db773e8d7c3e03004ba820c7ddb04ef1ce93064f002b96ca4e49326d749055e7d5f3c9ed2d + python-3.12.6-embed-win32.zip - 3.11.8 + 3.12.6 tools\python.exe - https://www.nuget.org/api/v2/package/python/3.11.8 - 8c1abd622fb2795fb87ab5208764fe13f7f4d69f2283b4237ea47b7c14b0989b5b4169f1ac1d3b1f417c6c2cc3d85ce151370dae8efc807c93e57cd67fa3c8cf - python-3.11.8.nupkg.zip + https://www.nuget.org/api/v2/package/python/3.12.6 + 2c7aea2435ee076140e366149d23e8c8280b3f90b419d29461d2312dcf761452586400684cb15d471530a07d2b513d0b19d0c83d670356785e68bd96bccacf4e + python-3.12.6.nupkg.zip 3.29.2 diff --git a/versions/baseline.json b/versions/baseline.json index 3c95f95dc94f1d..892856bc9eb5be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7253,8 +7253,8 @@ "port-version": 7 }, "python3": { - "baseline": "3.11.8", - "port-version": 4 + "baseline": "3.11.10", + "port-version": 0 }, "qca": { "baseline": "2.3.7", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 5d582b5cbbdc7f..37fc4a3b148ff8 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a5c2869b2a7652c367eda5ba6f9468030f927c9", + "version": "3.11.10", + "port-version": 0 + }, { "git-tree": "42da794facada8d85273d1efcc53f1af7e8cb243", "version": "3.11.8", From 80a7d5c748b9200df97317e0e080b27020c5a517 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Sun, 29 Sep 2024 19:59:46 +0300 Subject: [PATCH 2/2] [vcpkg-get-python-packages] Update pip to 24.2 --- ports/vcpkg-get-python-packages/vcpkg.json | 2 +- .../x_vcpkg_get_python_packages.cmake | 13 +++++-------- versions/baseline.json | 2 +- versions/v-/vcpkg-get-python-packages.json | 5 +++++ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ports/vcpkg-get-python-packages/vcpkg.json b/ports/vcpkg-get-python-packages/vcpkg.json index 8d7870ca009887..4590bd8cde6f5e 100644 --- a/ports/vcpkg-get-python-packages/vcpkg.json +++ b/ports/vcpkg-get-python-packages/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-get-python-packages", - "version-date": "2024-01-24", + "version-date": "2024-09-29", "documentation": "https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_get_python_packages", "license": "MIT", "supports": "native" diff --git a/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake b/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake index fdda6cfe80ede1..73e9bc049f3676 100644 --- a/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake +++ b/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake @@ -18,10 +18,6 @@ function(x_vcpkg_get_python_packages) endif() endif() - if(arg_PYTHON_VERSION STREQUAL "3") - set(PYTHON_VERSION_MINOR 11) - endif() - if(NOT DEFINED arg_OUT_PYTHON_VAR) set(arg_OUT_PYTHON_VAR "PYTHON${arg_PYTHON_VERSION}") endif() @@ -42,8 +38,8 @@ function(x_vcpkg_get_python_packages) vcpkg_from_github( OUT_SOURCE_PATH PYFILE_PATH REPO pypa/get-pip - REF 38e54e5de07c66e875c11a1ebbdb938854625dd8 #2022-03-07 - SHA512 431a9f66618a2f251db3a8c3311e7fc3af3ff7364ec1d14a99f1b9c237646b6146cef8b9471d83e1086dba2ed448bccc48d99b2bb375e4235d78e76d9970d3e5 + REF 24.2 + SHA512 7bcbc841564b7fc3cd2c109b9d3cfd34d853508edc9e040e9615fc0f9f18f74c7826d53671f65fa1abda3fd29a0a3f9f6114d9e9bdd6d120175ac207fd7ce321 ) vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/public/get-pip.py" --no-warn-script-location WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" @@ -75,8 +71,9 @@ function(x_vcpkg_get_python_packages) file(MAKE_DIRECTORY "${python_dir}/DLLs") set(python_sub_path /Scripts) set(python_venv virtualenv) - if(EXISTS "${python_dir}/python3${PYTHON_VERSION_MINOR}.zip") - file(COPY "${python_dir}/python3${PYTHON_VERSION_MINOR}.zip" DESTINATION "${venv_path}/Scripts") + file(GLOB python_zipped_stdlib "${python_dir}/python3*.zip") + if(python_zipped_stdlib) + file(COPY ${python_zipped_stdlib} DESTINATION "${venv_path}/Scripts") endif() set(python_venv_options "--app-data" "${venv_path}/data") else() diff --git a/versions/baseline.json b/versions/baseline.json index 892856bc9eb5be..222ba9ac3d6a13 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9293,7 +9293,7 @@ "port-version": 0 }, "vcpkg-get-python-packages": { - "baseline": "2024-01-24", + "baseline": "2024-09-29", "port-version": 0 }, "vcpkg-gfortran": { diff --git a/versions/v-/vcpkg-get-python-packages.json b/versions/v-/vcpkg-get-python-packages.json index 7733d854847d93..d375b4b185abde 100644 --- a/versions/v-/vcpkg-get-python-packages.json +++ b/versions/v-/vcpkg-get-python-packages.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7d017ccabcaf02739662b60cc1000b8489acb22", + "version-date": "2024-09-29", + "port-version": 0 + }, { "git-tree": "9205135e78e0cad47fd43c2f7abada1f4fbbdbaa", "version-date": "2024-01-24",