Changeset 1f991d6 in sasmodels

Timestamp:

Jan 27, 2018 6:57:31 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:

2ab1bac

Parents:

42158d2

Message:

add 'test' target to setup.py

Files:

• .travis.yml (modified) (2 diffs)
• appveyor.yml (modified) (2 diffs)
• setup.py (modified) (2 diffs)

.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 "pytest<4"
+- conda install --yes python=$PY numpy scipy cython mako docutils cffi setuptools "pytest<4"
 install:
 - pip install bumps
@@ -45 +45 @@
 - python --version
 #- python -m sasmodels.model_test -v dll all
-- python -m pytest -v --cache-clear
+#- python -m pytest -v --cache-clear
+- python setup.py test --pytest-args -v
 before_deploy:
 - echo -e "Host danse.chem.utk.edu\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config

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 "pytest<4"
+    - cmd: conda install --yes --quiet numpy scipy 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
@@ -89 +89 @@
     #- python -m sasmodels.model_test dll all
     #- nosetests -v sasmodels/*.py
-    - python -m pytest -v --cache-clear
+    #- python -m pytest -v --cache-clear
+    - python setup.py test --pytest-args -v

setup.py

@@ -1 @@
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
+import sys
+from setuptools import setup
+from setuptools.command.test import test as TestCommand
+
+class PyTest(TestCommand):
+    user_options = [('pytest-args=', 'a', "Arguments to pass to pytest")]
+
+    def initialize_options(self):
+        TestCommand.initialize_options(self)
+        self.pytest_args = ''
+
+    def run_tests(self):
+        import shlex
+        #import here, cause outside the eggs aren't loaded
+        import pytest
+        errno = pytest.main(shlex.split(self.pytest_args))
+        sys.exit(errno)
 
 def find_version(package):
@@ -48 +61 @@
         'sasmodels': ['*.c', '*.cl'],
     },
-    install_requires = [
+    install_requires=[
     ],
-    extras_require = {
+    extras_require={
         'OpenCL': ["pyopencl"],
         'Bumps': ["bumps"],
         'TinyCC': ["tinycc"],
     },
+    build_requires=['setuptools'],
+    test_requires=['pytest'],
+    cmdclass = {'test': PyTest},
 )