From 17790802c6f3f31b30ad36f4a163eacf8eb6049e Mon Sep 17 00:00:00 2001
From: Rémi Flamary <remi.flamary@gmail.com>
Date: Wed, 9 May 2018 13:32:47 +0200
Subject: add several python 3

---
 .travis/before_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis/before_install.sh')

diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index 60d1dcf..ce18f12 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -6,7 +6,7 @@ if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
     # e.g. brew install pyenv-virtualenv
     #brew update
     #brew install python
-    echo do othing
+    echo do nothing
 
 
 else
-- 
cgit v1.2.3


From 96dfa124909f1334974dfd6f3519b145acc2c155 Mon Sep 17 00:00:00 2001
From: Rémi Flamary <remi.flamary@gmail.com>
Date: Wed, 9 May 2018 13:36:42 +0200
Subject: install python with brew on macosx

---
 .travis/before_install.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to '.travis/before_install.sh')

diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index ce18f12..ddaa142 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -4,10 +4,8 @@ if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
 
     # Install some custom requirements on OS X
     # e.g. brew install pyenv-virtualenv
-    #brew update
-    #brew install python
-    echo do nothing
-
+    brew update
+    brew install python
 
 else
     # Install some custom requirements on Linux
-- 
cgit v1.2.3


From 4090857cfcda73d383e4cdbcc466fe326f06bd19 Mon Sep 17 00:00:00 2001
From: Rémi Flamary <remi.flamary@gmail.com>
Date: Wed, 9 May 2018 14:15:48 +0200
Subject: test install pip on macosx

---
 .travis/before_install.sh | 5 +++--
 Makefile                  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to '.travis/before_install.sh')

diff --git a/.travis/before_install.sh b/.travis/before_install.sh
index ddaa142..0ae6249 100755
--- a/.travis/before_install.sh
+++ b/.travis/before_install.sh
@@ -4,8 +4,9 @@ if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
 
     # Install some custom requirements on OS X
     # e.g. brew install pyenv-virtualenv
-    brew update
-    brew install python
+    #brew update
+    #brew install python
+    sudo easy_install -U pip
 
 else
     # Install some custom requirements on Linux
diff --git a/Makefile b/Makefile
index 95714b8..0de3fe9 100644
--- a/Makefile
+++ b/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
-- 
cgit v1.2.3