mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 23:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'refs/merge-requests/140' of gitorious.org:f-droid/fdroidserver

Browse source
This commit is contained in:
Daniel Martí 2014-04-03 13:01:09 +02:00
commit d6289b7832
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
jenkins-build.sh → jenkins-build
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# #
# this is the script run by the Jenkins server to run the build and tests. Be # this is the script run by the Jenkins server to run the build and tests. Be
# sure to always run it in its dir, i.e. ./jenkins-build.sh, otherwise it might # sure to always run it in its dir, i.e. ./jenkins-build.sh, otherwise it might
@ -76,11 +76,13 @@ set +e
# Module 'sys' has no '_MEIPASS' member # Module 'sys' has no '_MEIPASS' member
# disable F0401 until there is a plugin to handle this properly: # disable F0401 until there is a plugin to handle this properly:
# keysync-gui:25: [F] Unable to import 'ordereddict' # keysync-gui:25: [F] Unable to import 'ordereddict'
pylint --output-format=parseable --reports=n \ # use the virtualenv python so pylint checks against its installed libs
python /usr/bin/pylint --output-format=parseable --reports=n \
fdroidserver/*.py fdroid makebuildserver setup.py > $WORKSPACE/pylint.parseable fdroidserver/*.py fdroid makebuildserver setup.py > $WORKSPACE/pylint.parseable
# to only tell jenkins there was an error if we got ERROR or FATAL, uncomment these: # to only tell jenkins there was an error if we got ERROR or FATAL, uncomment these:
#[ $(($? & 1)) = "1" ] && exit 1 [ $(($? & 1)) = "1" ] && echo "FATALs found"
#[ $(($? & 2)) = "2" ] && exit 2 [ $(($? & 2)) = "2" ] && echo "ERRORs found"
[ $(($? & 4)) = "4" ] && echo "WARNINGs found"
set -e set -e

5
setup.py
View file

@ -27,8 +27,11 @@ setup(name='fdroidserver',
('fdroidserver/getsig', ['fdroidserver/getsig/getsig.class']) ('fdroidserver/getsig', ['fdroidserver/getsig/getsig.class'])
], ],
install_requires=[ install_requires=[
'python-magic', 'mwclient',
'paramiko',
'PIL', 'PIL',
'python-magic',
'ssh',
], ],
classifiers=[ classifiers=[
'Development Status :: 3 - Alpha', 'Development Status :: 3 - Alpha',