MNT Quick fix for setup.py clean #23426
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for the PR! Not that I understand all the intricacies involved, but would it not be safer/cleaner to only change the pure setuptools-based section, e.g. something like this: diff --git a/setup.py b/setup.py
index 7ad32e95e..ede4f3b6c 100755
--- a/setup.py
+++ b/setup.py
@@ -290,6 +290,8 @@ def setup_package():
from setuptools import setup
metadata["version"] = VERSION
+ # disable package discovery in setuptools >= 61
+ metadata["packages"] = ["sklearn"]
else:
if sys.version_info < required_python_version:
required_version = "%d.%d" % required_python_version |
|
CI is green, the change only affects the few commands based on setuptools ( |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Reference Issues/PRs
Fixes #23423
What does this implement/fix? Explain your changes.
Adding the
packageskwarg tosetupis a quick fix to the original issue.