use 'python2' everywhere since fdroidserver has not been tested with 3.x

diff --git a/README b/README
index 218deff818099d04e9a293fa2709ad06c282cb7d..6efc5cd870555d3fdc820e214eedabcc48c4bd63 100644 (file)
--- a/README
+++ b/README
@@ -27,4 +27,4 @@ install:
     virtualenv env/
     . env/bin/activate
     pip install -e .
-    python setup.py install
+    python2 setup.py install

diff --git a/jenkins-build b/jenkins-build
index 35add775cf37ae57b34a3d8b16f81ee268b043f5..4069d820d19df8c5251cf6ba3b1a66510f466e9e 100755 (executable)
--- a/jenkins-build
+++ b/jenkins-build
@@ -53,17 +53,17 @@ cd $WORKSPACE/tests
 #------------------------------------------------------------------------------#
 # test building the source tarball
 cd $WORKSPACE
-python setup.py sdist
+python2 setup.py sdist
 
 
 #------------------------------------------------------------------------------#
 # test install using site packages
 cd $WORKSPACE
 rm -rf $WORKSPACE/env
-virtualenv --system-site-packages $WORKSPACE/env
+virtualenv --python=python2 --system-site-packages $WORKSPACE/env
 . $WORKSPACE/env/bin/activate
 pip install -e $WORKSPACE
-python setup.py install
+python2 setup.py install
 
 # run tests in new pip+virtualenv install
 . $WORKSPACE/env/bin/activate
@@ -81,7 +81,7 @@ sh hooks/pre-commit
 cd $WORKSPACE
 set +e
 # use the virtualenv python so pylint checks against its installed libs
-    PYTHONPATH=$WORKSPACE/.pylint-plugins python /usr/bin/pylint \
+    PYTHONPATH=$WORKSPACE/.pylint-plugins python2 /usr/bin/pylint \
         --output-format=parseable --reports=n \
         --load-plugins astng_hashlib \
         fdroidserver/*.py fdroid makebuildserver setup.py > $WORKSPACE/pylint.parseable

diff --git a/tests/run-tests b/tests/run-tests
index ec9e2edc940dad0127dd4a95ffd6a332306a5743..214233c2136408fecfa20e9088b5852f5637f2ba 100755 (executable)
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -77,12 +77,17 @@ if [ -z $aapt ]; then
     aapt=`ls -1 $ANDROID_HOME/build-tools/*/aapt | sort | tail -1`
 fi
 
+# allow the location of python to be overridden
+if [ -z $python ]; then
+    python=python2
+fi
+
 
 #------------------------------------------------------------------------------#
 echo_header "create a source tarball and use that to build a repo"
 
 cd $WORKSPACE
-python setup.py sdist
+$python setup.py sdist
 
 REPOROOT=`create_test_dir`
 cd $REPOROOT