Handle jenkins requirements properly

This commit is contained in:
James Laska
2014-10-02 16:16:27 -04:00
parent f9c8e400b1
commit d12dddebde
8 changed files with 8 additions and 14 deletions

View File

@@ -96,14 +96,10 @@ requirements_jenkins:
fi fi
$(MAKE) requirements $(MAKE) requirements
@if [ "$(VIRTUAL_ENV)" ]; then \ @if [ "$(VIRTUAL_ENV)" ]; then \
(cd requirements && pip install -r jenkins.txt); \ (cd requirements && pip install -U -r jenkins.txt); \
(cd requirements && pip install -U pyflakes pep8 pylint); \
(cd requirements && pip install -U pycrypto); \
$(PYTHON) fix_virtualenv_setuptools.py; \ $(PYTHON) fix_virtualenv_setuptools.py; \
else \ else \
(cd requirements && sudo pip install -r jenkins.txt); \ (cd requirements && sudo pip install -U -r jenkins.txt); \
(cd requirements && sudo pip install -U pyflakes pep8 pylint); \
(cd requirements && sudo pip install -U pycrypto); \
fi fi
npm install -g csslint jshint npm install -g csslint jshint

View File

@@ -29,7 +29,7 @@ Django>=1.6.7,<1.7
django-debug-toolbar django-debug-toolbar
django-devserver>0.7 django-devserver>0.7
unittest2 unittest2
django-jenkins<0.15 django-jenkins
ipython ipython
# You may also need to install the following extra packages using the OS # You may also need to install the following extra packages using the OS

View File

@@ -84,11 +84,13 @@ logilab-common-0.61.0.tar.gz
astroid-1.0.1.tar.gz astroid-1.0.1.tar.gz
# Needed by django-jenkins: # Needed by django-jenkins:
coverage-3.7.1.tar.gz coverage-3.7.1.tar.gz
pylint-1.1.0.tar.gz pylint-1.3.1.zip
pep8-1.5.7.tar.gz
pyflakes-0.8.1.tar.gz
# Remaining dev-only packages: # Remaining dev-only packages:
django-debug-toolbar-1.1.tar.gz django-debug-toolbar-1.1.tar.gz
django-devserver-0.8.0.tar.gz django-devserver-0.8.0.tar.gz
django-jenkins-0.14.1.tar.gz django-jenkins-0.16.3.tar.gz
ipython-1.2.1.tar.gz ipython-1.2.1.tar.gz
# You may also need to install the following extra packages using the OS # You may also need to install the following extra packages using the OS

Binary file not shown.

View File

@@ -1,12 +1,8 @@
# PIP requirements for running Tower unittests in jenkins. # PIP requirements for running Tower unittests in jenkins.
# Install using "pip --no-index -r jenkins.txt". # Install using "pip --no-index -r jenkins.txt".
django-jenkins
ansible ansible
coverage
pyzmq pyzmq
python-memcached python-memcached
pyflakes
pep8
pylint
python-ldap python-ldap
pycrypto

Binary file not shown.

Binary file not shown.

Binary file not shown.