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

remove setuptools monkey patch #222

Merged
merged 1 commit into from
Apr 24, 2022

Conversation

davidhewitt
Copy link
Member

I believe the upstream PR in pypa/distutils#43 got released in setuptools 58, so we can bump dependency and drop our patching.

@mgorny is there a way in which you can test if this fixes #221? My hunch is that it will.

@davidhewitt davidhewitt force-pushed the remove-monkey-patch branch from fcd3a05 to e2438d9 Compare April 23, 2022 06:28
@mgorny
Copy link

mgorny commented Apr 23, 2022

@mgorny is there a way in which you can test if this fixes #221? My hunch is that it will.

Yes, I can confirm that cryptography builds fine after applying the patch.

@@ -7,6 +7,6 @@

@nox.session()
def test(session: nox.Session):
session.install(SETUPTOOLS_RUST, "pytest", "cffi")
session.install(SETUPTOOLS_RUST, "pytest", "cffi", "distutils-extra")
Copy link

Choose a reason for hiding this comment

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

I don't think python-distutils-extra is on pypi (or at least I couldn't find it). I don't really know nox but if it just wraps pip, I suppose you could use the tarball: https://launchpad.net/python-distutils-extra/trunk/2.39/+download/python-distutils-extra-2.39.tar.gz

Copy link
Member Author

Choose a reason for hiding this comment

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

Ehh, I can't manage to verify the crash with or without that tarball installed locally.

As you've verified the patch works, I'm happy 👍

Copy link
Member

@messense messense left a comment

Choose a reason for hiding this comment

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

👍

@davidhewitt davidhewitt force-pushed the remove-monkey-patch branch from e2438d9 to 3441f25 Compare April 24, 2022 04:54
@davidhewitt davidhewitt merged commit 2c92b49 into PyO3:main Apr 24, 2022
@davidhewitt davidhewitt deleted the remove-monkey-patch branch April 24, 2022 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TypeError if setuptools_rust are used and python-distutils-extra are installed
3 participants