Merge branch 'travis_python' of github.com:jtattermusch/grpc into travis-c++

Conflicts:
	.travis.yml

.travis.yml

@@ -3,12 +3,13 @@ before_install:
   - sudo add-apt-repository ppa:yjwong/gflags -y
   - sudo apt-get update -qq
   - sudo apt-get install -qq libgtest-dev libgflags-dev
+<<<<<<< HEAD
 script:
   - ./tools/run_tests/run_tests.py -l c -t -j 16 -c dbg
   - ./tools/run_tests/run_tests.py -l c -t -j 16 -c opt
   - ./tools/run_tests/run_tests.py -l c++ -t -j 16 -c dbg
   - ./tools/run_tests/run_tests.py -l c++ -t -j 16 -c opt
   - ./tools/run_tests/run_tests.py -l node -t -j 16 -c opt
-  - ./tools/run_tests/run_tests.py -l python -t -j 16 -c opt
+  - ./tools/run_tests/run_tests.py -l python -t -j 1 -c opt
 notifications:
   email: false

tools/run_tests/build_python.sh

@@ -37,7 +37,6 @@ make -j6
 
 root=`pwd`
 virtualenv python2.7_virtual_environment
-ln -sf $root/include/grpc python2.7_virtual_environment/include/grpc
 source python2.7_virtual_environment/bin/activate
 pip install enum34==1.0.4 futures==2.2.0 protobuf==3.0.0-alpha-1
 CFLAGS=-I$root/include LDFLAGS=-L$root/libs/opt pip install src/python/src