Merge pull request #236 from Peque/ci

Use pytest to run the test suite

.travis.yml

@@ -51,10 +51,9 @@ before_install:
 - hash -r;
 - conda config --set always_yes yes --set changeps1 no;
 - conda create -y -q -n test_cq -c cadquery -c conda-forge pythonocc-core=0.18.2 oce=0.18.2 python=$TRAVIS_PYTHON_VERSION
-  pyparsing mock;
 - source ~/miniconda/bin/activate test_cq;
+- pip install .[dev]
 - python -c 'import OCC.gp as gp; print(gp.gp_Vec())'
-- pip install codecov
 
 install:
 - python setup.py install
@@ -64,7 +63,7 @@ before_script:
 - sudo rm -f /cores/core.*
 
 script:
-- coverage run runtests.py
+- pytest -v --cov
 
 after_success:
 - codecov

appveyor.yml

@@ -19,13 +19,13 @@ install:
     - conda update -q conda
     - conda create --quiet --name cqtest -c cadquery -c conda-forge -c dlr-sc pythonocc-core=0.18.2 python=%PYTHON_VERSION% pyparsing mock coverage codecov
     - activate cqtest
-    - pip install codecov
+    - pip install .[dev]
     - python setup.py install
 
 build: false
 
 test_script:
-    - coverage run runtests.py
+    - pytest -v --cov
 
 on_success:
     - codecov

environment.yml

@@ -6,9 +6,6 @@ dependencies:
   - python=3.6
   - pythonocc-core=0.18.2
   - oce=0.18.2
-  - pyparsing
+  - pip
   - pip:
-    - "--editable=."
-    # Documentation
-    - sphinx
-    - sphinx_rtd_theme
+    - "--editable=.[dev]"

requirements-dev.txt

@@ -1,3 +0,0 @@
-sphinx-rtd-theme==0.1.9
-travis-sphinx==1.1.0
-Sphinx==1.3.1

runtests.py

@@ -1,22 +0,0 @@
-import sys
-from tests import *
-import cadquery
-import unittest
-
-#if you are on python 2.7, you can use -m uniitest discover.
-#but this is required for python 2.6.6 on windows. FreeCAD0.12 will not load
-#on py 2.7.x on win
-suite = unittest.TestSuite()
-
-suite.addTests(unittest.TestLoader().loadTestsFromTestCase(TestCadObjects.TestCadObjects))
-suite.addTests(unittest.TestLoader().loadTestsFromTestCase(TestCadQuery.TestCadQuery))
-suite.addTests(unittest.TestLoader().loadTestsFromTestCase(TestCQGI.TestCQGI))
-suite.addTests(unittest.TestLoader().loadTestsFromTestCase(TestCQSelectors.TestCQSelectors))
-suite.addTests(unittest.TestLoader().loadTestsFromTestCase(TestExporters.TestExporters))
-suite.addTests(unittest.TestLoader().loadTestsFromTestCase(TestImporters.TestImporters))
-suite.addTests(unittest.TestLoader().loadTestsFromTestCase(TestJupyter.TestJupyter))
-suite.addTests(unittest.TestLoader().loadTestsFromTestCase(TestWorkplanes.TestWorkplanes))
-
-if __name__ == '__main__':
-    result = unittest.TextTestRunner().run(suite)
-    sys.exit(not result.wasSuccessful())

setup.py

@@ -32,6 +32,17 @@ setup(
     long_description=open('README.md').read(),
     packages=['cadquery','cadquery.contrib','cadquery.occ_impl','cadquery.plugins','tests'],
     install_requires=['pyparsing'],
+    extras_require={
+        'dev': [
+            # Documentation
+            'sphinx',
+            'sphinx_rtd_theme',
+            # Testing
+            'codecov',
+            'pytest',
+            'pytest-cov',
+         ],
+    },
     include_package_data=True,
     zip_safe=False,
     platforms='any',