Merge pull request #46 from rflamary/build_macosx

Add Python 3.5 and 3.6 and remove macosx on travis

Author: ncourty

.travis.yml

@@ -1,13 +1,19 @@
 language: python
 matrix:
-    allow_failures:
-        - os: osx
+#    allow_failures:
+#        - os: osx
     include:
-        - os: osx
-          language: generic
+#        - os: osx
+#          language: generic
         - os: linux
           sudo: required
           python: 3.4
+        - os: linux
+          sudo: required
+          python: 3.5
+        - os: linux
+          sudo: required
+          python: 3.6        
         - os: linux
           sudo: required
           python: 2.7
@@ -26,5 +32,5 @@ install:
 script:
   - python setup.py develop
   - flake8 examples/ ot/ test/
-  - python -m py.test -v test/
+  - python -m pytest -v test/
   # - py.test ot test

.travis/before_install.sh

@@ -6,8 +6,7 @@ if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
     # e.g. brew install pyenv-virtualenv
     #brew update
     #brew install python
-    echo do othing
-
+    sudo easy_install -U pip
 
 else
     # Install some custom requirements on Linux

Makefile

@@ -44,7 +44,7 @@ test : FORCE pep8
 	$(PYTHON) -m pytest -v test/ --cov=ot --cov-report html:cov_html
 
 pytest : FORCE 
-	$(PYTHON) -m py.test -v test/ --cov=ot
+	$(PYTHON) -m pytest -v test/ --cov=ot
 
 uploadpypi :
 	#python setup.py register

requirements.txt

@@ -5,3 +5,4 @@ matplotlib
 sphinx-gallery
 autograd
 pymanopt
+pytest