Fix travis (#301)

* Disable ipyparallel for Mac OS on Travis * Increase required version of pytest
elfi-dev · Dec 11, 2018 · 04c0c9e · 04c0c9e
1 parent 29dc788
commit 04c0c9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,6 +25,6 @@ install:
   - pip install -e .
 
 script:
-  - ipcluster start -n 2 --daemon
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ipcluster start -n 2 --daemon ; fi
   #- travis_wait 20 make test
   - make test
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,5 +1,5 @@
 # Testing
-pytest>=3.0.3
+pytest>=3.6
 tox>=2.4.1
 coverage>=4.2
 pytest-cov>=2.4.0