diff options
| author | Jason Lowe-Power <jason@lowepower.com> | 2017-11-17 17:02:05 -0800 |
|---|---|---|
| committer | Jason Lowe-Power <jason@lowepower.com> | 2017-12-14 00:27:59 +0000 |
| commit | f07d5069d86e31ecf195664850f79fb00c445bd3 (patch) | |
| tree | f54ac06896fa828f873d199a0e9b25bd94911c79 /ext/pybind11/tests/conftest.py | |
| parent | 3f64b374c49491f18dc2ca538ed8c8597e4aac83 (diff) | |
| download | gem5-f07d5069d86e31ecf195664850f79fb00c445bd3.tar.xz | |
ext: Upgrade PyBind11 to version 2.2.1
This upgrade is necessary for pybind to build with GCC 7.2.
We still need to add the patch for stl.h. MSC_FULL_VER change is no longer
needed.
See https://gem5-review.googlesource.com/c/public/gem5/+/2230
Change-Id: I806729217d022070583994c2dfcaa74476aef30f
Signed-off-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-on: https://gem5-review.googlesource.com/5801
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'ext/pybind11/tests/conftest.py')
| -rw-r--r-- | ext/pybind11/tests/conftest.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/pybind11/tests/conftest.py b/ext/pybind11/tests/conftest.py index 5b08004e3..f4c228260 100644 --- a/ext/pybind11/tests/conftest.py +++ b/ext/pybind11/tests/conftest.py @@ -196,7 +196,7 @@ def pytest_namespace(): except ImportError: scipy = None try: - from pybind11_tests import have_eigen + from pybind11_tests.eigen import have_eigen except ImportError: have_eigen = False pypy = platform.python_implementation() == "PyPy" @@ -211,6 +211,8 @@ def pytest_namespace(): 'requires_eigen_and_scipy': skipif(not have_eigen or not scipy, reason="eigen and/or scipy are not installed"), 'unsupported_on_pypy': skipif(pypy, reason="unsupported on PyPy"), + 'unsupported_on_py2': skipif(sys.version_info.major < 3, + reason="unsupported on Python 2.x"), 'gc_collect': gc_collect } |