Merge pull request #3 from nickhand/use-pytest

using pytest and two versions of Tester
bccp · Mar 30, 2017 · 83444d5 · 83444d5
2 parents 1739906 + 211a25b
commit 83444d5
Show file tree

Hide file tree

Showing 16 changed files with 717 additions and 641 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,14 +17,14 @@ before_install:
 install:
     - conda create --yes -n test python=$TRAVIS_PYTHON_VERSION
     - source activate test
-    - conda install --yes numpy=$NUMPY_VERSION nose mpi4py
+    - conda install --yes numpy=$NUMPY_VERSION mpi4py pytest coverage
     - python setup.py install
 
 script: 
-    - python ./runtests.py --mpirun -t mpi4py_test/tests/test_mpiworld.py
+    - python ./runtests.py tests/test_mpiworld.py --mpirun
     # expecting a failure for uncollective
-    - if python ./runtests.py --mpirun -t mpi4py_test/tests/test_uncollective.py ; then false; fi;
-    - bash check_tag.sh mpi4py_test/version.py
+    - if python ./runtests.py tests/test_uncollective.py --mpirun; then false; fi;
+    - bash check_tag.sh runtests/version.py
 
 deploy:
     - provider: pypi