use correct py.test for python version

.travis.yml

@@ -91,7 +91,8 @@ before_script:
     # Make sure everyone uses the correct python
     - mkdir ~/bin && ln -s `which python${PYTHON}` ~/bin
     - export PATH=~/bin:$PATH
-
+    - which python
+    - python --version
 
 script:
     # Run unit tests
@@ -112,9 +113,9 @@ script:
       fi;
     
     # Check install works
-    - CWD=`pwd`
+    - python setup.py install
-    - python setup.py install && cd .. && echo "import pyqtgraph.examples" | python
+    - cd ..; echo "import pyqtgraph.examples" | python
     
     # Check double-install fails
-    - cd pyqtgraph && python setup.py install && if [ $? == 0 ]; then false; fi;
+    - cd pyqtgraph && python setup.py install && if [ $? == 0 ]; then false; else true; fi;
 

tools/setupHelpers.py

@@ -32,7 +32,10 @@ def checkStyle():
 
 def unitTests():
     try:
-        out = check_output('PYTHONPATH=. py.test', shell=True)
+        if sys.version[0] == 3:
+            out = check_output('PYTHONPATH=. py.test-3', shell=True)
+        else:
+            out = check_output('PYTHONPATH=. py.test', shell=True)
         ret = 0
     except Exception as e:
         out = e.output