File tree 2 files changed +3
-4
lines changed
2 files changed +3
-4
lines changed Original file line number Diff line number Diff line change @@ -54,7 +54,6 @@ make_conda() {
54
54
55
55
if [[ " $DISTRIB " == " conda" ]]; then
56
56
TO_INSTALL=" python=$PYTHON_VERSION pip pytest pytest-cov \
57
- pytest-xdist \
58
57
numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \
59
58
cython=$CYTHON_VERSION "
60
59
@@ -90,7 +89,7 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then
90
89
# and scipy
91
90
virtualenv --system-site-packages --python=python3 testvenv
92
91
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
94
93
95
94
elif [[ " $DISTRIB " == " scipy-dev" ]]; then
96
95
make_conda python=3.7
@@ -102,7 +101,7 @@ elif [[ "$DISTRIB" == "scipy-dev" ]]; then
102
101
echo " Installing joblib master"
103
102
pip install https://github.com/joblib/joblib/archive/master.zip
104
103
export SKLEARN_SITE_JOBLIB=1
105
- pip install pytest pytest-xdist pytest- cov
104
+ pip install pytest pytest-cov
106
105
fi
107
106
108
107
if [[ " $COVERAGE " == " true" ]]; then
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ except ImportError:
21
21
python -c " import multiprocessing as mp; print('%d CPUs' % mp.cpu_count())"
22
22
23
23
run_tests () {
24
- TEST_CMD=" pytest -n2 - -showlocals --durations=20 --pyargs"
24
+ TEST_CMD=" pytest --showlocals --durations=20 --pyargs"
25
25
26
26
# Get into a temp directory to run test from the installed scikit-learn and
27
27
# check if we do not leave artifacts
You can’t perform that action at this time.
0 commit comments