From c7aa35bab11189cfbbfec751e35c53616a259ea3 Mon Sep 17 00:00:00 2001
From: Eric Dill <edill@bnl.gov>
Date: Fri, 17 Jul 2015 15:17:26 -0400
Subject: [PATCH] MNT: dont install pyside for python 3

MNT: 'fi;'

';'

???

!!!

remove the 4 threads option from py.test

MNT: remove lingering sudo

MNT: all the pwd's and ls's

MNT: Remove the cd
---
 .travis.yml | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 538bce1b..2fab778f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,10 @@ install:
     - conda update conda --yes
     - conda create -n test_env python=${PYTHON} --yes
     - source activate test_env
-    - conda install numpy pyopengl pyside pyqt pytest flake8 six --yes
+    - conda install numpy pyopengl pyqt pytest flake8 six --yes
+    - if [${PYTHON} == '2.7']; then
+          conda install pyside --yes;
+      fi;
     - pip install pytest-xdist # multi-thread py.test
     - export PYTEST=py.test;
     
@@ -73,7 +76,8 @@ before_script:
     # Make sure everyone uses the correct python (this is handled by conda)
     - which python
     - python --version
-    
+    - pwd
+    - ls
     # Help color output from each test
     - RESET='\033[0m';
       RED='\033[00;31m';
@@ -115,18 +119,24 @@ before_script:
         fi;
       fi;
       
-    - cd $TRAVIS_DIR
-
+    #- cd $TRAVIS_DIR
+    
 
 script:
+  
+    - source activate test_env
     
     # Run unit tests
+    - pwd
+    - ls
     - start_test "unit tests";
-      PYTHONPATH=. py.test pyqtgraph/ -n 4;
+      PYTHONPATH=. py.test pyqtgraph/;
       check_output "unit tests";
     
     
     # check line endings
+    - pwd
+    - ls
     - if [ "${TEST}" == "extra" ]; then
         start_test "line ending check";
         ! find ./ -name "*.py" | xargs file | grep CRLF &&
@@ -135,6 +145,8 @@ script:
       fi;
 
     # Check repo size does not expand too much
+    - pwd
+    - ls
     - if [ "${TEST}" == "extra" ]; then
         start_test "repo size check";
         echo -e "Estimated content size difference = ${SIZE_DIFF} kB" &&
@@ -143,6 +155,8 @@ script:
       fi;
 
     # Check for style issues
+    - pwd
+    - ls
     - if [ "${TEST}" == "extra" ]; then
         start_test "style check";
         cd ~/repo-clone &&
@@ -151,20 +165,26 @@ script:
         check_output "style check";
       fi;
 
-    - cd $TRAVIS_DIR
+    # - cd $TRAVIS_DIR
     
     # Check install works
+    - pwd
+    - ls
     - start_test "install test";
       python setup.py --quiet install;
       check_output "install test";
     
     # Check double-install fails
     # Note the bash -c is because travis strips off the ! otherwise.
+    - pwd
+    - ls
     - start_test "double install test";
-      bash -c "! sudo python${PYTHON} setup.py --quiet install";
+      bash -c "! python setup.py --quiet install";
       check_output "double install test";
       
     # Check we can import pg
+    - pwd
+    - ls
     - start_test "import test";
       echo "import sys; print(sys.path)" | python &&
       cd /; echo "import pyqtgraph.examples" | python;