8000 Use latest numpy and some tests as known failure · scikit-learn/scikit-learn@ca3c1be · GitHub
[go: up one dir, main page]

Skip to content

Commit ca3c1be

Browse files
committed
Use latest numpy and some tests as known failure
1 parent 9dbdf3c commit ca3c1be

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

build_tools/circle/build_test_pypy.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ source pypy-env/bin/activate
1818
python --version
1919
which python
2020

21-
pip install --extra-index https://antocuni.github.io/pypy-wheels/ubuntu numpy==1.14.4 Cython pytest
21+
pip install --extra-index https://antocuni.github.io/pypy-wheels/ubuntu numpy Cython pytest
2222
pip install "scipy>=1.1.0" sphinx numpydoc docutils pytest-xdist
2323

2424
ccache -M 512M
@@ -27,5 +27,5 @@ export PATH=/usr/lib/ccache:$PATH
2727

2828
pip install -vv -e .
2929

30-
pytest -n 1 -Wignore::DeprecationWarning -Wignore::FutureWarning sklearn/
30+
pytest -n 1 sklearn/
3131
make test-sphinxext test-doc

sklearn/tests/test_docstring_parameters.py

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from sklearn.utils.testing import check_docstring_parameters
1818
from sklearn.utils.testing import _get_func_name
1919
from sklearn.utils.testing import ignore_warnings
20+
from sklearn.utils.testing import fails_if_pypy
2021
from sklearn.utils.deprecation import _is_deprecated
2122

2223
PUBLIC_MODULES = set([pckg[1] for pckg in walk_packages(prefix='sklearn.',
@@ -43,6 +44,7 @@
4344
]
4445

4546

47+
@fails_if_pypy # this segfaults with PyPy-6.0
4648
# numpydoc 0.8.0's docscrape tool raises because of collections.abc under
4749
# Python 3.7
4850
@ignore_warnings(category=DeprecationWarning)

sklearn/tests/test_multioutput.py

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
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
1718
from sklearn import datasets
1819
from sklearn.base import clone
1920
from sklearn.datasets import make_classification
@@ -162,6 +163,7 @@ def test_multi_target_sample_weights():
162163
classes = list(map(np.unique, (y1, y2, y3)))
163164

164165

166+
@fails_if_pypy # FIXME
165167
def test_multi_output_classification_partial_fit_parallelism():
166168
sgd_linear_clf = SGDClassifier(loss='log', random_state=1, max_iter=5)
167169
mor = MultiOutputClassifier(sgd_linear_clf, n_jobs=-1)

0 commit comments

Comments
 (0)
0