Skip to content

Commit

Permalink
MAINT using pytest-xdist and pin coverage to 6.2 (scikit-learn#22311)
Browse files Browse the repository at this point in the history
  • Loading branch information
glemaitre committed Jan 27, 2022
1 parent 89d8a1a commit e8521d5
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
4 changes: 3 additions & 1 deletion build_tools/azure/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ python -m pip install $(get_dep threadpoolctl $THREADPOOLCTL_VERSION) \
$(get_dep pytest-xdist $PYTEST_XDIST_VERSION)

if [[ "$COVERAGE" == "true" ]]; then
python -m pip install codecov pytest-cov
# XXX: coverage is temporary pinned to 6.2 because 6.3 multiprocessing fork-safe
# cf. https://github.com/nedbat/coveragepy/issues/1310
python -m pip install codecov pytest-cov coverage==6.2
fi

if [[ "$PYTEST_XDIST_VERSION" != "none" ]]; then
Expand Down
4 changes: 3 additions & 1 deletion build_tools/azure/install_win.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ if [[ "$PYTEST_XDIST_VERSION" != "none" ]]; then
fi

if [[ "$COVERAGE" == "true" ]]; then
pip install coverage codecov pytest-cov
# XXX: coverage is temporary pinned to 6.2 because 6.3 multiprocessing fork-safe
# cf. https://github.com/nedbat/coveragepy/issues/1310
pip install coverage codecov pytest-cov coverage==6.2
fi

python --version
Expand Down
2 changes: 1 addition & 1 deletion build_tools/azure/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
MATPLOTLIB_VERSION: 'latest'
PYTEST_VERSION: 'latest'
# Disable pytest-xdist as it can stall builds
PYTEST_XDIST_VERSION: 'none'
PYTEST_XDIST_VERSION: 'latest'
THREADPOOLCTL_VERSION: 'latest'
COVERAGE: 'true'
TEST_DOCSTRINGS: 'false'
Expand Down
2 changes: 1 addition & 1 deletion build_tools/azure/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
SKLEARN_SKIP_NETWORK_TESTS: '1'
PYTEST_VERSION: '5.2.1'
# Disable pytest-xdist as it can stall builds
PYTEST_XDIST_VERSION: 'none'
PYTEST_XDIST_VERSION: 'latest'
TEST_DIR: '$(Agent.WorkFolder)/tmp_folder'
SHOW_SHORT_SUMMARY: 'false'
CPU_COUNT: '2'
Expand Down
4 changes: 3 additions & 1 deletion build_tools/circle/build_test_arm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ mamba install --verbose -y ccache \
setup_ccache

if [[ "$COVERAGE" == "true" ]]; then
mamba install --verbose -y codecov pytest-cov
# XXX: coverage is temporary pinned to 6.2 because 6.3 multiprocessing fork-safe
# cf. https://github.com/nedbat/coveragepy/issues/1310
mamba install --verbose -y codecov pytest-cov coverage=6.2
fi

if [[ "$TEST_DOCSTRINGS" == "true" ]]; then
Expand Down

0 comments on commit e8521d5

Please sign in to comment.