8000 Revert "MAINT workaround for bug in setuptools/pkg_resources (#21676)… · scikit-learn/scikit-learn@e067a4e · GitHub
[go: up one dir, main page]

Skip to content

Commit e067a4e

Browse files
thomasjpfanglemaitre
authored andcommitted
Revert "MAINT workaround for bug in setuptools/pkg_resources (#21676)" (#21723)
This reverts commit a0b5e1b.
1 parent cbb38c8 commit e067a4e

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

build_tools/azure/test_script.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ if [[ -n "$CHECK_WARNINGS" ]]; then
4545

4646
# Python 3.10 deprecates disutils and is imported by numpy interally during import time
4747
TEST_CMD="$TEST_CMD -Wignore:The\ distutils:DeprecationWarning"
48-
49-
# Workaround for https://github.com/pypa/setuptools/issues/2885
50-
TEST_CMD="$TEST_CMD -Wignore:Creating\ a\ LegacyVersion:DeprecationWarning"
5148
fi
5249

5350
if [[ "$PYTEST_XDIST_VERSION" != "none" ]]; then

setup.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ addopts =
1515
filterwarnings =
1616
ignore:the matrix subclass:PendingDeprecationWarning
1717

18-
# Workaround for https://github.com/pypa/setuptools/issues/2885
19-
ignore::DeprecationWarning:pkg_resources
20-
2118
[wheelhouse_uploader]
2219
artifact_indexes=
2320
# Wheels built by the "Wheel builder" workflow in GitHub actions:

0 commit comments

Comments
 (0)
0