Changeset bb4ff2a in sasmodels

Timestamp:

Jan 26, 2018 10:45:35 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

42158d2

Parents:

ecb485c

Message:

work around travis/appveyor limitations for pytest

Files:

• .travis.yml (modified) (1 diff)
• appveyor.yml (modified) (1 diff)
• conftest.py (modified) (1 diff)

.travis.yml

@@ -38 +38 @@
 - conda info -a
 # 2018-01-26 PAK: sasmodels uses yield generator for tests, which isn't supported in pytest 4+
-- conda install --yes python=$PY numpy scipy cython mako cffi "pytest<4"
+- conda install --yes python=$PY numpy scipy cython mako docutils cffi "pytest<4"
 install:
 - pip install bumps

appveyor.yml

@@ -69 +69 @@
     # 2018-01-19 PAK: skipping toolchain cython and cffi (these were for pyopencl?)
     # 2018-01-26 PAK: sasmodels uses yield generator for tests, which isn't supported in pytest 4+
-    - cmd: conda install --yes --quiet numpy scipy "pytest<4"
+    - cmd: conda install --yes --quiet numpy scipy docutils "pytest<4"
     # 2018-01-19 PAK: skipping pyopencl; this would be needed for deploy but maybe not for test
     #- cmd: conda install --yes --channel conda-forge pyopencl

conftest.py

@@ -11 +11 @@
 test specifically from the py.test command line. [This is perhaps because
 the modifyitems hook is only called after test selection.]
+
+*pytest_ignore_collect* skips kernelcl.py if pyopencl cannot be imported.
 """
 from __future__ import print_function
 
+import os.path
+
 import pytest
 from _pytest.unittest import TestCaseFunction
+
+try:
+    import pyopencl
+    TEST_PYOPENCL = True
+except ImportError:
+    TEST_PYOPENCL = False
+
+def pytest_ignore_collect(path, config):
+    ignore = TEST_PYOPENCL and path.basename == "kernelcl.py"
+    return ignore
 
 USE_DOCSTRING_AS_DESCRIPTION = True