mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
use 'python2' everywhere since fdroidserver has not been tested with 3.x
This commit is contained in:
parent
40d4e30010
commit
7a3992aa1a
2
README
2
README
@ -27,4 +27,4 @@ install:
|
|||||||
virtualenv env/
|
virtualenv env/
|
||||||
. env/bin/activate
|
. env/bin/activate
|
||||||
pip install -e .
|
pip install -e .
|
||||||
python setup.py install
|
python2 setup.py install
|
||||||
|
@ -53,17 +53,17 @@ cd $WORKSPACE/tests
|
|||||||
#------------------------------------------------------------------------------#
|
#------------------------------------------------------------------------------#
|
||||||
# test building the source tarball
|
# test building the source tarball
|
||||||
cd $WORKSPACE
|
cd $WORKSPACE
|
||||||
python setup.py sdist
|
python2 setup.py sdist
|
||||||
|
|
||||||
|
|
||||||
#------------------------------------------------------------------------------#
|
#------------------------------------------------------------------------------#
|
||||||
# test install using site packages
|
# test install using site packages
|
||||||
cd $WORKSPACE
|
cd $WORKSPACE
|
||||||
rm -rf $WORKSPACE/env
|
rm -rf $WORKSPACE/env
|
||||||
virtualenv --system-site-packages $WORKSPACE/env
|
virtualenv --python=python2 --system-site-packages $WORKSPACE/env
|
||||||
. $WORKSPACE/env/bin/activate
|
. $WORKSPACE/env/bin/activate
|
||||||
pip install -e $WORKSPACE
|
pip install -e $WORKSPACE
|
||||||
python setup.py install
|
python2 setup.py install
|
||||||
|
|
||||||
# run tests in new pip+virtualenv install
|
# run tests in new pip+virtualenv install
|
||||||
. $WORKSPACE/env/bin/activate
|
. $WORKSPACE/env/bin/activate
|
||||||
@ -81,7 +81,7 @@ sh hooks/pre-commit
|
|||||||
cd $WORKSPACE
|
cd $WORKSPACE
|
||||||
set +e
|
set +e
|
||||||
# use the virtualenv python so pylint checks against its installed libs
|
# 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 \
|
--output-format=parseable --reports=n \
|
||||||
--load-plugins astng_hashlib \
|
--load-plugins astng_hashlib \
|
||||||
fdroidserver/*.py fdroid makebuildserver setup.py > $WORKSPACE/pylint.parseable
|
fdroidserver/*.py fdroid makebuildserver setup.py > $WORKSPACE/pylint.parseable
|
||||||
|
@ -77,12 +77,17 @@ if [ -z $aapt ]; then
|
|||||||
aapt=`ls -1 $ANDROID_HOME/build-tools/*/aapt | sort | tail -1`
|
aapt=`ls -1 $ANDROID_HOME/build-tools/*/aapt | sort | tail -1`
|
||||||
fi
|
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"
|
echo_header "create a source tarball and use that to build a repo"
|
||||||
|
|
||||||
cd $WORKSPACE
|
cd $WORKSPACE
|
||||||
python setup.py sdist
|
$python setup.py sdist
|
||||||
|
|
||||||
REPOROOT=`create_test_dir`
|
REPOROOT=`create_test_dir`
|
||||||
cd $REPOROOT
|
cd $REPOROOT
|
||||||
|
Loading…
Reference in New Issue
Block a user