Skip to content

Unpin the types-setuptools build dependency #14787

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
merged 5 commits into from
Feb 28, 2023
Merged

Unpin the types-setuptools build dependency #14787

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e459ea
Fix mypyc build errors on `master`
AlexWaygood Feb 26, 2023
b8b3b58
Merge remote-tracking branch 'origin/master' into patch-1
AlexWaygood Feb 26, 2023
58273fb
Revert "Pin `types-setuptools` to <67.4.0.2 (#14788)"
AlexWaygood Feb 26, 2023
1a595bd
Try Jelle's suggestion
AlexWaygood Feb 26, 2023
633bc30
Fix lints
AlexWaygood Feb 26, 2023
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
7 changes: 4 additions & 3 deletions mypyc/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,14 @@ def get_extension() -> type[Extension]:
# We can work with either setuptools or distutils, and pick setuptools
# if it has been imported.
use_setuptools = "setuptools" in sys.modules
extension_class: type[Extension]

if not use_setuptools:
from distutils.core import Extension
from distutils.core import Extension as extension_class
Copy link
Member

@JelleZijlstra JelleZijlstra Feb 26, 2023

Choose a reason for hiding this comment

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

Suggested change
from distutils.core import Extension as extension_class
import distutils.core
extension_class = distutils.core.Extension

Just a hunch

Copy link
Member Author

@AlexWaygood AlexWaygood Feb 26, 2023

Choose a reason for hiding this comment

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

Trying it out now...

Copy link
Member Author

@AlexWaygood AlexWaygood Feb 26, 2023

Choose a reason for hiding this comment

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

And it worked!

else:
from setuptools import Extension
from setuptools import Extension as extension_class

return Extension
return extension_class


def setup_mypycify_vars() -> None:
Expand Down