CadQuery · adam-urbanczyk · Dec 13, 2019 · Dec 12, 2019 · Dec 12, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -51,26 +51,25 @@ 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
 
 before_script:
-- ulimit -c unlimited -S 
+- ulimit -c unlimited -S
 - sudo rm -f /cores/core.*
 
 script:
-- coverage run runtests.py
+- pytest -v --cov
 
 after_success:
 - codecov
 
 after_failure:
-- ls /cores/core.* 
+- ls /cores/core.*
 - lldb --core `ls /cores/core.*` --batch --one-line "bt"
 
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -19,14 +19,14 @@ 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
 

diff --git a/environment.yml b/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]"
diff --git a/requirements-dev.txt b/requirements-dev.txt
diff --git a/requirements.txt b/requirements.txt
diff --git a/runtests.py b/runtests.py
diff --git a/setup.py b/setup.py
@@ -32,6 +32,17 @@
     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',

diff --git a/tests/TestCadObjects.py → tests/test_cad_objects.py b/tests/TestCadObjects.py → tests/test_cad_objects.py
diff --git a/tests/TestCadQuery.py → tests/test_cadquery.py b/tests/TestCadQuery.py → tests/test_cadquery.py
diff --git a/tests/TestCQGI.py → tests/test_cqgi.py b/tests/TestCQGI.py → tests/test_cqgi.py
diff --git a/tests/TestExporters.py → tests/test_exporters.py b/tests/TestExporters.py → tests/test_exporters.py
diff --git a/tests/TestImporters.py → tests/test_importers.py b/tests/TestImporters.py → tests/test_importers.py
diff --git a/tests/TestJupyter.py → tests/test_jupyter.py b/tests/TestJupyter.py → tests/test_jupyter.py
diff --git a/tests/TestCQSelectors.py → tests/test_selectors.py b/tests/TestCQSelectors.py → tests/test_selectors.py
diff --git a/tests/TestWorkplanes.py → tests/test_workplanes.py b/tests/TestWorkplanes.py → tests/test_workplanes.py