8000 Use LOKY_MAX_CPU_COUNT and python -m pytest · scikit-learn/scikit-learn@8e31357 · GitHub
[go: up one dir, main page]

Skip to content

Commit 8e31357

Browse files
committed
Use LOKY_MAX_CPU_COUNT and python -m pytest
1 parent c14542c commit 8e31357

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build_tools/circle/build_test_pypy.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ pip install "scipy>=1.1.0" sphinx numpydoc docutils pytest-xdist
2424
ccache -M 512M
2525
export CCACHE_COMPRESS=1
2626
export PATH=/usr/lib/ccache:$PATH
27+
export LOKY_MAX_CPU_COUNT="2"
2728

2829
pip install -vv -e .
2930

30-
pytest -n 1 sklearn/
31-
make test-sphinxext test-doc
31+
python -m pytest -n 1 sklearn/
32+
python -m pytest doc/sphinxext/
33+
python -m pytest $(find doc -name '*.rst' | sort)

sklearn/tests/test_multioutput.py

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from sklearn.utils.testing import assert_greater
1515
from sklearn.utils.testing import assert_not_equal
1616
from sklearn.utils.testing import assert_array_almost_equal
17-
from sklearn.utils.testing import fails_if_pypy
1817
from sklearn import datasets
1918
from sklearn.base import clone
2019
from sklearn.datasets import make_classification
@@ -163,7 +162,6 @@ def test_multi_target_sample_weights():
163162
classes = list(map(np.unique, (y1, y2, y3)))
164163

165164

166-
@fails_if_pypy # FIXME
167165
def test_multi_output_classification_partial_fit_parallelism():
168166
sgd_linear_clf = SGDClassifier(loss='log', random_state=1, max_iter=5)
169167
mor = MultiOutputClassifier(sgd_linear_clf, n_jobs=-1)

0 commit comments

Comments
 (0)
0