Skip to content

Commit 87dec48

Browse files
committed
Skip a few tests due to bugs in PyPy
1 parent e6bd3d7 commit 87dec48

File tree

4 files changed

+4
-16
lines changed

4 files changed

+4
-16
lines changed

.travis.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@ matrix:
192192
make pytest -j 2"
193193
set +ex
194194
allow_failures:
195-
- name: PyPy 7.3, Python 2.7, c++11, gcc 4.8
196-
- name: PyPy 7.3, Python 3.6, c++11, gcc 5
197195
- name: Python 3.9 beta, c++17, gcc 7 (w/o numpy/scipy)
198196
cache:
199197
directories:
@@ -236,15 +234,9 @@ before_install:
236234
SCRIPT_RUN_PREFIX="docker exec --tty $containerid"
237235
$SCRIPT_RUN_PREFIX sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done'
238236
else
239-
<<<<<<< HEAD
240-
if [ "$PYPY" = "5.8.0" ]; then
241-
curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.8.0-linux64.tar.bz2 | tar xj
242-
PY_CMD=$(echo `pwd`/pypy2-v5.8.0-linux64/bin/pypy)
243-
=======
244237
if [ -n "$PYPY" ]; then
245238
curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy$PYTHON-v$PYPY-linux64.tar.bz2 | tar xj
246239
PY_CMD=$(echo `pwd`/pypy$PYTHON-v$PYPY-linux64/bin/pypy$PY)
247-
>>>>>>> 8c0cd94465fbc1dbc34217e5a614edc784f0913e
248240
CMAKE_EXTRA_ARGS+=" -DPYTHON_EXECUTABLE:FILEPATH=$PY_CMD"
249241
elif [ -n "$PYPY" ]; then
250242
curl -fSL https://bitbucket.org/pypy/pypy/downloads/pypy${PYTHON:0:3}-v${PYPY}-linux64.tar.bz2 | tar xj
@@ -291,19 +283,12 @@ install:
291283
fi
292284
293285
local PIP_CMD=""
294-
<<<<<<< HEAD
295-
export NPY_NUM_BUILD_JOBS=2
296-
if [ -n "$PYPY" ]; then
297-
echo Installing "pytest"
298-
$PY_CMD -m pip install --user --upgrade pytest
299-
=======
300286
if [ -n "$PYPY" ]; then
301287
# For expediency, install only versions that are available on the extra index.
302288
travis_wait 30 \
303289
$PY_CMD -m pip install --user --upgrade --extra-index-url https://antocuni.github.io/pypy-wheels/manylinux2010 \
304290
numpy scipy
305291
$PY_CMD -m pip install --user --upgrade pytest
306-
>>>>>>> 8c0cd94465fbc1dbc34217e5a614edc784f0913e
307292
else
308293
echo "Installing pytest, numpy, scipy..."
309294
$PY_CMD -m pip install --user --upgrade pytest numpy scipy

tests/conftest.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ def pytest_configure():
215215
pytest.requires_eigen_and_scipy = skipif(
216216
not have_eigen or not scipy, reason="eigen and/or scipy are not installed")
217217
pytest.unsupported_on_pypy = skipif(pypy, reason="unsupported on PyPy")
218+
pytest.bug_in_pypy = skipif(pypy, reason="bug in PyPy")
218219
pytest.unsupported_on_pypy3 = skipif(pypy and sys.version_info.major >= 3,
219220
reason="unsupported on PyPy3")
220221
pytest.unsupported_on_pypy_lt_6 = skipif(pypy and sys.pypy_version_info[0] < 6,

tests/test_local_bindings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ def test_internal_locals_differ():
152152
assert m.local_cpp_types_addr() != cm.local_cpp_types_addr()
153153

154154

155+
@pytest.bug_in_pypy
155156
def test_stl_caster_vs_stl_bind(msg):
156157
"""One module uses a generic vector caster from `<pybind11/stl.h>` while the other
157158
exports `std::vector<int>` via `py:bind_vector` and `py::module_local`"""

tests/test_multiple_inheritance.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ def test_multiple_inheritance_cpp():
1010
assert mt.bar() == 4
1111

1212

13+
@pytest.bug_in_pypy
1314
def test_multiple_inheritance_mix1():
1415
class Base1:
1516
def __init__(self, i):
@@ -48,7 +49,7 @@ def __init__(self, i, j):
4849
assert mt.foo() == 3
4950
assert mt.bar() == 4
5051

51-
52+
@pytest.bug_in_pypy
5253
def test_multiple_inheritance_python():
5354

5455
class MI1(m.Base1, m.Base2):

0 commit comments

Comments
 (0)