Skip to content

Commit bb65b3e

Browse files
committed
REV: Turns off pytest-xdist on CI
1 parent d6a96e4 commit bb65b3e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

build_tools/travis/install.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ make_conda() {
5454

5555
if [[ "$DISTRIB" == "conda" ]]; then
5656
TO_INSTALL="python=$PYTHON_VERSION pip pytest pytest-cov \
57-
pytest-xdist \
5857
numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \
5958
cython=$CYTHON_VERSION"
6059

@@ -90,7 +89,7 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then
9089
# and scipy
9190
virtualenv --system-site-packages --python=python3 testvenv
9291
source testvenv/bin/activate
93-
pip install pytest pytest-cov pytest-xdist cython joblib==$JOBLIB_VERSION
92+
pip install pytest pytest-cov cython joblib==$JOBLIB_VERSION
9493

9594
elif [[ "$DISTRIB" == "scipy-dev" ]]; then
9695
make_conda python=3.7
@@ -102,7 +101,7 @@ elif [[ "$DISTRIB" == "scipy-dev" ]]; then
102101
echo "Installing joblib master"
103102
pip install https://github.com/joblib/joblib/archive/master.zip
104103
export SKLEARN_SITE_JOBLIB=1
105-
pip install pytest pytest-xdist pytest-cov
104+
pip install pytest pytest-cov
106105
fi
107106

108107
if [[ "$COVERAGE" == "true" ]]; then

build_tools/travis/test_script.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ except ImportError:
2121
python -c "import multiprocessing as mp; print('%d CPUs' % mp.cpu_count())"
2222

2323
run_tests() {
24-
TEST_CMD="pytest -n2 --showlocals --durations=20 --pyargs"
24+
TEST_CMD="pytest --showlocals --durations=20 --pyargs"
2525

2626
# Get into a temp directory to run test from the installed scikit-learn and
2727
# check if we do not leave artifacts

0 commit comments

Comments
 (0)