Changing the auto-install method.

Author: mithro

.travis-setup.sh

@@ -10,7 +10,7 @@ ls -l /dev/shm
 sudo apt-get update --fix-missing
 
 # Install python-imaging from the environment rather then build it.
-# If the below fails, pip will build it via the .requirements
+# If the below fails, pip will build it via the requirements.txt
 sudo apt-get install python-imaging
 VIRTUAL_ENV_site_packages=$(echo $VIRTUAL_ENV/lib/*/site-packages)
 VIRTUAL_ENV_python_version=$(echo $VIRTUAL_ENV_site_packages | sed -e's@.*/\(.*\)/site-packages@\1@')
@@ -52,4 +52,5 @@ Firefox)
 	;;
 esac
 
-pip install -r .requirements --use-mirrors || pip install -r .requirements
+R=tools/python/requirements.txt
+pip install -r $R --use-mirrors || pip install -r $R

.travis.yml

@@ -34,7 +34,7 @@ script:
   - if [ x$BROWSER == "xRemote" -a x$SAUCE_ACCESS_KEY == "x" ]; then
       true;
     else
-      echo python run-tests.py -a $ARGS | bash;
+      echo ./run-tests.sh $ARGS | bash;
     fi
 
 after_failure:

run-tests.sh

@@ -0,0 +1,15 @@
+#! /bin/bash
+
+# Update git submodules
+git submodule init
+git submodule update
+
+# If already in a VIRTUAL_ENV assume the person knows what they are doing,
+# otherwise set up a python virtualenv with all the needed requirements.
+if [ x$VIRTUAL_ENV == x"" ]; then
+  cd tools/python
+  source setup.sh
+  cd ../..
+fi
+
+exec python tools/python/run-tests.py $@

.requirements tools/python/requirements.txt

@@ -32,10 +32,6 @@
     "-d", "--dontexit", action='store_true', default=False,
     help="At end of testing, don't exit.")
 
-parser.add_argument(
-    "-a", "--auto-install", action='store_true', default=True,
-    help="Auto install any dependencies.")
-
 parser.add_argument(
     "-v", "--verbose", action='store_true', default=False,
     help="Output more information.")
@@ -84,69 +80,6 @@
 
 import subprocess
 
-# Set up the git repository
-if args.auto_install:
-    subprocess.check_call(["git", "submodule", "init"])
-    subprocess.check_call(["git", "submodule", "update"])
-
-
-# Install the python modules
-def autoinstall(name, package=None):
-    if not package:
-        package = name
-
-    if args.auto_install:
-        try:
-            import pip
-        except ImportError:
-            raise SystemExit("""\
-Can not autoinstall as PIP is not avaliable.
-
-To install 'pip' please ask your administrator to install the package
-'python-pip' or run:
-# sudo apt-get install python-pip
-""")
-
-        from pip.req import InstallRequirement
-        install = InstallRequirement(package, None)
-        install.check_if_exists()
-
-        if install.satisfied_by is None:
-            print "Unable to find %s, autoinstalling" % (name,)
-
-            if install.conflicts_with:
-                raise SystemExit("""
-Can't install %s because it conflicts with already installed %s.
-
-Please try installing %s manually with:
-# sudo pip install --upgrade %s
-""" % (name, install.conflicts_with, name, package.replace(">", "\>")))
-
-            ret = subprocess.call(["pip", "install", "--user", package])
-            if ret == 0:  # UNKNOWN_ERROR
-                # Restart python is a nasty way, only method to get imports to
-                # refresh.
-                python = sys.executable
-                os.execl(python, python, *sys.argv)
-            else:
-                raise SystemExit("""
-Unknown error occurred.
-
-Please install the Python %s module.
-# sudo pip install %s
-""" % (name, package.replace(">", "\n")))
-
-for line in file(".requirements").readlines():
-    if line.startswith('#') or not line.strip():
-        continue
-
-    if line.find('#') >= 0:
-        package, name = line.split('#')
-
-        autoinstall(name.strip(), package.strip())
-    else:
-        autoinstall(line.strip())
-
 if not args.sauce:
     # Get any selenium drivers we might need
     if args.browser == "Chrome":

run-tests.py tools/python/run-tests.py

@@ -0,0 +1,55 @@
+#! /bin/bash
+
+# Create the python environment needed by run-tests.py and closure-linter and
+# other Python tools.
+
+OLD_PWD=$PWD
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+cd $DIR
+if [ ! -f bin/activate ]; then
+  echo "Setting up Python environment in $DIR"
+
+  if [ x$(which pip) == x -o x$(which virtualenv) == x ]; then
+    cat <<EOF
+Can not autoinstall as pip and virtualenv are not avaliable.
+
+To install 'pip' please do one of the following;
+
+# sudo apt-get install python-pip python-virtualenv
+
+or
+
+# sudo easy_install pip
+# sudo pip install virtualenv
+EOF
+    exit 1
+  fi
+
+  if virtualenv --system-site-packages .; then
+    echo -e;
+  else
+   cat <<EOF
+Was unable to set up the virtualenv environment. Please see output for errors.
+EOF
+    exit 1
+  fi
+fi
+
+source bin/activate
+
+# Check if the dependencies are installed
+pip install --no-download -r requirements.txt > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+  # Install dependencies
+  pip install -r requirements.txt
+  if [ $? -ne 0 ]; then
+    cat <<EOF
+Unable to install the required dependencies. Please see error output above.
+EOF
+    exit 1
+  fi
+fi
+
+cd $OLD_PWD