Skip to content
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.

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

Python 3.10: fix deprecated win7 support patch #21236

Merged
merged 2 commits into from
Nov 13, 2021
Merged

Conversation

lakor64
Copy link
Contributor

@lakor64 lakor64 commented Nov 7, 2021

  • What does your PR fix?

Fixes building of python3 with win7 support

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

tested on x86-windows-static

I think yes

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

Yes

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 66c39e113a348a6ae80419fae5a629b951b00f1a -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/p-/python3.json b/versions/p-/python3.json
index 049f43e..d1be599 100644
--- a/versions/p-/python3.json
+++ b/versions/p-/python3.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "1d0520eb68f885be8164fbe6060d1d97973bea28",
+      "git-tree": "d82868d73c1fef612f6d510750a33d306b1a04df",
       "version-semver": "3.10.0",
       "port-version": 1
     },

@Hoikas
Copy link
Contributor

Hoikas commented Nov 7, 2021

What problem are you trying to fix? The patch works perfectly in my testing.

@lakor64
Copy link
Contributor Author

lakor64 commented Nov 7, 2021

What problem are you trying to fix? The patch works perfectly in my testing.

When I tried to do vcpkg install python3[deprecated-win7-support] it got me an error saying that the patch was not applicable

@JackBoosY JackBoosY added the category:port-bug The issue is with a library, which is something the port should already support label Nov 8, 2021
versions/p-/python3.json Outdated Show resolved Hide resolved
@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Nov 9, 2021
@lakor64
Copy link
Contributor Author

lakor64 commented Nov 9, 2021

I'm sorry I caused some confusion by using the word "fix". What my commit does is updating the windows 7 deprecated patch to work on Python 3.10. I haven't applied any fix to the existing patch just updated it to having it correctly applied.

@dan-shaw dan-shaw added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Nov 9, 2021
@JackBoosY
Copy link
Contributor

Can you please resolve the file conflict?

@lakor64
Copy link
Contributor Author

lakor64 commented Nov 11, 2021

Can you please resolve the file conflict?

Is it ok now?

@JackBoosY JackBoosY added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Nov 12, 2021
@JackBoosY
Copy link
Contributor

LGTM.

@dan-shaw dan-shaw merged commit 56136f5 into microsoft:master Nov 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants