Added changes from working repo.

Author: mmasdeu

.travis-deploy-doc.sh

@@ -25,3 +25,4 @@ if [[ "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "${DEPLOY_DOC
 	git push origin gh-pages
     fi
 fi
+/usr/bin/killall python2

.travis-test.sh

@@ -1,11 +1,7 @@
-#! /bin/bash
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.  This file is offered as-is,
-# without any warranty.
+#! /bin/sh
 set -e
-export PATH=$PATH:$HOME/SageMath
-$HOME/SageMath/sage -pip install --upgrade -i https://pypi.python.org/pypi -v sagemath
+
+$HOME/SageMath/sage -pip install --upgrade -v -i https://pypi.python.org/pypi sagemath
 $HOME/SageMath/sage -pip install --upgrade --no-index -v .
 $HOME/SageMath/sage setup.py test
 (cd docs && $HOME/SageMath/sage -sh -c "make html")

.travis.yml

@@ -1,5 +1,4 @@
 language: python
-dist: precise
 matrix:
   include:
   - env: CACHE_NAME=latest DEPLOY_DOC_FROM_BRANCH=master DEPLOY_DOC_TO_REPOSITORY=mmasdeu/sage_sample

setup.py

@@ -30,16 +30,11 @@ def readfile(filename):
 # Check the right Sage version
 class build(build_module.build):
     def run(self):
-        try:
-            errno = os.system('''sage -python -c "from sagemath.check_version import check_version; check_version('%s')"'''%sage_required_version)
-        except ValueError:
-            errno = -1
-        if errno != 0:
-            sys.exit(1)
-        # from sagemath.check_version import check_version
-        # check_version(sage_required_version)
+        from sagemath.check_version import check_version
+        check_version(sage_required_version)
         build_module.build.run(self)
 
+
 # For the tests
 class SageTest(TestCommand):
     def run_tests(self):