Changeset 335271e in sasmodels

Timestamp:

Jan 31, 2018 2:59:52 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:

0e7611b

Parents:

f354e46

Message:

remove restriction on pytest<4

Files:

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

.travis.yml

@@ -37 +37 @@
 - conda update --yes conda
 - 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 matplotlib docutils setuptools "pytest<4"
+- conda install --yes python=$PY numpy scipy matplotlib docutils setuptools pytest
 install:
 - pip install bumps

appveyor.yml

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

@@ -20 +20 @@
 import pytest
 from _pytest.unittest import TestCaseFunction
+from _pytest.compat import is_generator
+
+def pytest_pycollect_makeitem(collector, name, obj):
+    """
+    Convert test generator into list of function tests so that pytest doesn't
+    complain about deprecated yield tests.
+
+    Note that unlike nose, the tests are generated and saved instead of run
+    immediately.  This means that any dynamic context, such as a for-loop
+    variable, must be captured by wrapping the yield result in a function call.
+
+    For example::
+
+        for value in 1, 2, 3:
+            for test in test_cases:
+                yield test, value
+
+    will need to be changed to::
+
+        def build_test(test, value):
+            return test, value
+        for value in 1, 2, 3:
+            for test in test_cases:
+                yield build_test(test, value)
+
+    This allows the context (test and value) to be captured by lexical closure
+    in build_test. See https://stackoverflow.com/a/233835/6195051.
+    """
+    if collector.istestfunction(obj, name) and is_generator(obj):
+        tests = [pytest.Function(name, parent=collector, args=yielded[1:], callobj=yielded[0])
+                 for yielded in obj()]
+        return tests
+
 
 USE_DOCSTRING_AS_DESCRIPTION = True