8000 Revert "CLN Move to setup.cfg [scipy-dev]" · thomasjpfan/scikit-learn@6f164e8 · GitHub
[go: up one dir, main page]

Skip to content

Commit 6f164e8

Browse files
committed
Revert "CLN Move to setup.cfg [scipy-dev]"
This reverts commit cab39ec.
1 parent cab39ec commit 6f164e8

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

build_tools/azure/test_script.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,21 @@ if [[ "$COVERAGE" == "true" ]]; then
3636
# report that otherwise hides the test failures and forces long scrolls in
3737
# the CI logs.
3838
export COVERAGE_PROCESS_START="$BUILD_SOURCESDIRECTORY/.coveragerc"
39-
TEST_CMD="$TEST_CMD --cov-config=$COVERAGE_PROCESS_START --cov sklearn --cov-report="
39+
TEST_CMD="$TEST_CMD --cov-config='$COVERAGE_PROCESS_START' --cov sklearn --cov-report="
4040
fi
4141

4242
if [[ -n "$CHECK_WARNINGS" ]]; then
4343
# numpy's 1.19.0's tostring() deprecation is ignored until scipy and joblib removes its usage
4444
TEST_CMD="$TEST_CMD -Werror::DeprecationWarning -Werror::FutureWarning -Wignore:tostring:DeprecationWarning"
45+
46+
# Python 3.10 deprecates disutils and is imported by numpy interally during import time
47+
TEST_CMD="$TEST_CMD -Wignore:The\ distutils:DeprecationWarning"
4548
fi
4649

4750
if [[ "$PYTEST_XDIST_VERSION" != "none" ]]; then
4851
TEST_CMD="$TEST_CMD -n2"
4952
fi
5053

5154
set -x
52-
$TEST_CMD --pyargs sklearn
55+
eval "$TEST_CMD --pyargs sklearn"
5356
set +x

setup.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ addopts =
1919

2020
filterwarnings =
2121
ignore:the matrix subclass:PendingDeprecationWarning
22-
# Python 3.10 deprecates disutils and is imported by numpy interally during import time
23-
ignore:The distutils:DeprecationWarning
2422

2523
[wheelhouse_uploader]
2624
artifact_indexes=

0 commit comments

Comments
 (0)
0