[python3] Bump to 3.10.7 #27558

Hoikas · 2022-10-30T21:51:49Z

Bump the python3 port to the latest revision of 3.10.x as a precursor to upgrading to 3.11.0. This front-loads some (but not all) of the tweaks that will need to be made to the patches for 3.11.0.

What does your PR fix?
- Updates python to 3.10.7.
- Some patch files were diffs masquerading as patch files. Change those to actual patch files so they can be more easily applied onto the cpython repo.
- Fixed a compile breakage in the Windows 7 patch introduced somewhere between 3.10.5 and 3.10.7.
- Tweaked some of the static building patches to prevent conditional patch content appearing in unconditional context lines. This will be more relevant in 3.11.0, but I'm front loading it now.
Which triplets are supported/not supported? Have you updated the CI baseline?

No change
Does your PR follow the maintainer guide?

Yes
If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

Indeed

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

github-actions

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/python3/portfile.cmake

github-actions

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/python3/portfile.cmake

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

PRs must add only one version and must not modify any published versions

When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.

error: checked-in files for python3 have changed but the version was not updated
version: 3.10.7
old SHA: 55a0593645464a3a61e9121a91e94996fee5509c
new SHA: 5954f3500febdc5ad3970203732b0d83e9485552
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/python3/portfile.cmake

github-actions

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/python3/portfile.cmake

github-actions

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/python3/portfile.cmake

ports/python3/portfile.cmake

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout c58ae39a726c74c58489f7b9019ba6f7cbe7eaea -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index b0bf326..e4a6051 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6005,8 +6005,8 @@
       "port-version": 5
     },
     "python3": {
-      "baseline": "3.10.5",
-      "port-version": 4
+      "baseline": "3.10.7",
+      "port-version": 0
     },
     "qca": {
       "baseline": "2.3.4",
diff --git a/versions/p-/python3.json b/versions/p-/python3.json
index 15be433..9640aad 100644
--- a/versions/p-/python3.json
+++ b/versions/p-/python3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0a00472034282cbed6c49a68bb71b20973708c34",
+      "version": "3.10.7",
+      "port-version": 0
+    },
     {
       "git-tree": "a6bf44809eee3bfbce1b176e55d41beb54cac6f2",
       "version": "3.10.5",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/python3/portfile.cmake

github-actions

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated

git add -u && git commit
git checkout c58ae39a726c74c58489f7b9019ba6f7cbe7eaea -- versions
./vcpkg x-add-version --all

Diff

diff --git a/versions/baseline.json b/versions/baseline.json
index b0bf326..e4a6051 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6005,8 +6005,8 @@
       "port-version": 5
     },
     "python3": {
-      "baseline": "3.10.5",
-      "port-version": 4
+      "baseline": "3.10.7",
+      "port-version": 0
     },
     "qca": {
       "baseline": "2.3.4",
diff --git a/versions/p-/python3.json b/versions/p-/python3.json
index 15be433..16c66d6 100644
--- a/versions/p-/python3.json
+++ b/versions/p-/python3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d33abeb4e0d31ac42e9a6f9a05431fa8ab47fa07",
+      "version": "3.10.7",
+      "port-version": 0
+    },
     {
       "git-tree": "a6bf44809eee3bfbce1b176e55d41beb54cac6f2",
       "version": "3.10.5",

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/python3/portfile.cmake

github-actions

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/python3/portfile.cmake

github-actions

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/python3/portfile.cmake

When applying these back to the python3 repository and re-formatting, the gap in patch file numbers requires annoying manual renaming. Debunk that.

Diffs require multiple steps to import into the python3 repository. Debunk that. The patch format retains authorship information.

Something modified in the static library patch was being used as a context line in a later patch. How did this pass CI?

github-actions

You have modified or added at least one portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)
vcpkg_extract_source_archive_ex -> vcpkg_extract_source_archive
vcpkg_build_msbuild -> vcpkg_install_msbuild
vcpkg_copy_tool_dependencies -> vcpkg_copy_tools
vcpkg_apply_patches should be replaced by the PATCHES arguments to the "extract" helpers (e.g. vcpkg_from_github())

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

ports/python3/portfile.cmake

Hoikas · 2022-11-16T23:36:27Z

Everything is green, so we're ready for review.

JonLiu1993 · 2022-11-17T06:46:42Z

ports/python3/0002-static-library.patch

@@ -62,7 +75,7 @@ diff --git a/Python/sysmodule.c b/Python/sysmodule.c
 index ac49f7867a..f3583345ff 100644
 --- a/Python/sysmodule.c
 +++ b/Python/sysmodule.c
-@@ -2804,6 +2804,9 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict)
+@@ -2804,6 +2804,9 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict


@Hoikas, Thanks for your pr, I haven't looked into that, but it looks like there's a missing ")" here?

This line is generated by diff and describes the context for the human readers. Or confuses the reader ;-)

Heh, yeah, reading diffs of diffs is difficult. Like @dg0yt mentioned, this is a context line that needed to be updated due to changes by upstream. the ) was probably moved to a newline upstream.

JonLiu1993 · 2022-11-17T06:58:06Z

@Hoikas, I have reviewed this pr, it is very good, I saw that this pr has a big change to the upstream code, I think it is necessary to let the upstream know. do you think so?

JonLiu1993 · 2022-11-17T09:55:16Z

Feature deprecated-win7-support tested successfully in the following triplet:

x86-windows
x64-windows
x64-windows-static

Hoikas · 2022-11-17T23:40:22Z

@Hoikas, I have reviewed this pr, it is very good, I saw that this pr has a big change to the upstream code, I think it is necessary to let the upstream know. do you think so?

All of these patches are specific for building Python in the vcpkg environment or in ways that are not particularly supported upstream (eg deprecated-win7-support), so I don't think so.

BillyONeal

For what it's worth, we do not care about Windows 7: not even the server versions of that are in support anymore. Someone is willing to keep the patch here and I see no reason to go out of our way to break it but we won't hesitate to drop that if an update breaks it for some reason.

Thanks for the update!

github-actions bot previously approved these changes Oct 30, 2022

View reviewed changes

Hoikas dismissed github-actions[bot]’s stale review via e114ed7 October 30, 2022 23:19

Hoikas force-pushed the python3.10.7 branch from 167da5f to e114ed7 Compare October 30, 2022 23:19

github-actions bot previously approved these changes Oct 30, 2022

View reviewed changes

Hoikas dismissed github-actions[bot]’s stale review via b0e474f October 31, 2022 00:46

Hoikas force-pushed the python3.10.7 branch from e114ed7 to b0e474f Compare October 31, 2022 00:46

github-actions bot requested changes Oct 31, 2022

View reviewed changes

Hoikas force-pushed the python3.10.7 branch from b0e474f to 167da5f Compare October 31, 2022 00:47

github-actions bot previously approved these changes Oct 31, 2022

View reviewed changes

Cheney-W assigned JonLiu1993 Oct 31, 2022

JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Oct 31, 2022

Hoikas dismissed github-actions[bot]’s stale review via af4eb2a November 4, 2022 00:36

Hoikas force-pushed the python3.10.7 branch from 167da5f to af4eb2a Compare November 4, 2022 00:36

github-actions bot previously approved these changes Nov 4, 2022

View reviewed changes

dg0yt mentioned this pull request Nov 4, 2022

[vcpkg doc] Clarify that we do not want patch context blobs #27645

Closed

dg0yt reviewed Nov 4, 2022

View reviewed changes

ports/python3/portfile.cmake Outdated Show resolved Hide resolved

Hoikas dismissed github-actions[bot]’s stale review via 514f3a1 November 14, 2022 23:27

Hoikas force-pushed the python3.10.7 branch from af4eb2a to 514f3a1 Compare November 14, 2022 23:27

github-actions bot requested changes Nov 14, 2022

View reviewed changes

Hoikas force-pushed the python3.10.7 branch from 514f3a1 to d2f1d13 Compare November 14, 2022 23:31

github-actions bot requested changes Nov 14, 2022

View reviewed changes

Hoikas force-pushed the python3.10.7 branch from d2f1d13 to ec4e956 Compare November 15, 2022 00:31

github-actions bot previously approved these changes Nov 15, 2022

View reviewed changes

Hoikas dismissed github-actions[bot]’s stale review via 51f6683 November 15, 2022 02:50

github-actions bot previously approved these changes Nov 15, 2022

View reviewed changes

Hoikas added 5 commits November 15, 2022 18:05

[python3] Make patch files contiguous.

5339a1a

When applying these back to the python3 repository and re-formatting, the gap in patch file numbers requires annoying manual renaming. Debunk that.

[python3] Use patch files, not diffs.

ce93400

Diffs require multiple steps to import into the python3 repository. Debunk that. The patch format retains authorship information.

[python3] Fix problems with conflicting patches.

db5c372

Something modified in the static library patch was being used as a context line in a later patch. How did this pass CI?

[python3] Bump to 3.10.7.

5432bee

[python3] Fix Windows 7 patch.

e90572e

Hoikas added 4 commits November 15, 2022 18:05

[python3] Back out trivial patch changes.

3d6e11b

[python3] Apply unconditional patches first.

6fc3977

version things and stuff

a842307

Bump Python tools to 3.10.7.

b543e35

Hoikas dismissed github-actions[bot]’s stale review via b543e35 November 15, 2022 23:05

Hoikas force-pushed the python3.10.7 branch from 51f6683 to b543e35 Compare November 15, 2022 23:05

github-actions bot approved these changes Nov 15, 2022

View reviewed changes

Hoikas marked this pull request as ready for review November 16, 2022 23:36

JonLiu1993 requested changes Nov 17, 2022

View reviewed changes

JonLiu1993 added the requires:author-response label Nov 17, 2022

JonLiu1993 removed the requires:author-response label Nov 18, 2022

JonLiu1993 approved these changes Nov 18, 2022

View reviewed changes

JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Nov 18, 2022

BillyONeal approved these changes Nov 18, 2022

View reviewed changes

BillyONeal merged commit 5599ae4 into microsoft:master Nov 18, 2022

Hoikas deleted the python3.10.7 branch November 18, 2022 23:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[python3] Bump to 3.10.7 #27558

[python3] Bump to 3.10.7 #27558

Hoikas commented Oct 30, 2022

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

github-actions bot left a comment

Hoikas commented Nov 16, 2022

JonLiu1993 Nov 17, 2022

dg0yt Nov 17, 2022

Hoikas Nov 17, 2022

JonLiu1993 commented Nov 17, 2022

JonLiu1993 commented Nov 17, 2022

Hoikas commented Nov 17, 2022

BillyONeal left a comment

[python3] Bump to 3.10.7 #27558

[python3] Bump to 3.10.7 #27558

Conversation

Hoikas commented Oct 30, 2022

What does your PR fix?

Which triplets are supported/not supported? Have you updated the CI baseline?

Does your PR follow the maintainer guide?

If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

Hoikas commented Nov 16, 2022

JonLiu1993 Nov 17, 2022

Choose a reason for hiding this comment

dg0yt Nov 17, 2022

Choose a reason for hiding this comment

Hoikas Nov 17, 2022

Choose a reason for hiding this comment

JonLiu1993 commented Nov 17, 2022

JonLiu1993 commented Nov 17, 2022

Hoikas commented Nov 17, 2022

BillyONeal left a comment

Choose a reason for hiding this comment

If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result?