Changeset 2ab1bac in sasmodels

Timestamp:

Jan 27, 2018 5:08:19 PM (6 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:

6dba2f0

Parents:

1f991d6

Message:

include matplotlib in reqs; trying fixing opencl test for travis

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 docutils cffi setuptools "pytest<4"
+- conda install --yes python=$PY numpy scipy matplotlib docutils setuptools "pytest<4"
 install:
 - pip install bumps
-- pip install unittest-xml-reporting
+- pip install unittest-xml-reporting tinycc
 script:
 - python --version

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 docutils setuptools "pytest<4"
+    - cmd: conda install --yes --quiet numpy scipy matplotlib docutils setuptools "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

@@ -22 +22 @@
 
 try:
-    import pyopencl
+    # Ask OpenCL for the default context so that we know that one exists
+    import pyopencl as cl
+    cl.create_some_context(interactive=False)
     TEST_PYOPENCL = True
 except ImportError: