jjb/python-jenkins
Code Issues Proposed changes

Six is a runtime requirement not a test req

Browse Source 
Six needs to be installed when python-jenkins is installed. By default
test-requirements are only installed when running tests. Six was listed
as a test-requirement so it was not installed when pip installing
python-jenkins. Make six a regular requirement so that it is installed
properly every time.

Change-Id: I2b7cb7e967b20ee0e06fe4c665f08c5932e524f2
This commit is contained in:
Clark Boylan 2014-07-09 14:02:50 -07:00
parent 14cdd1e3b2
commit aa16b89bdf
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt Normal file
View File

@ -0,0 +1 @@
six

1
test-requirements.txt
View File

@ -2,7 +2,6 @@ coverage>=3.6
discover discover
hacking>=0.5.6,<0.8 hacking>=0.5.6,<0.8
mock mock
six
#unittest2 #unittest2
python-subunit python-subunit
sphinx>=1.1.2,<1.2 sphinx>=1.1.2,<1.2

6
tox.ini
View File

@ -7,7 +7,8 @@ envlist = pep8, py26, py27, pypy, py33, py34
setenv VIRTUAL_ENV={envdir} setenv VIRTUAL_ENV={envdir}
usedevelop = True usedevelop = True
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = python setup.py testr --slowest --testr-args='{posargs}' commands = python setup.py testr --slowest --testr-args='{posargs}'
[testenv:cover] [testenv:cover]
@ -16,7 +17,8 @@ commands =
coverage report --show-missing coverage report --show-missing
[testenv:py26] [testenv:py26]
deps = -r{toxinidir}/test-requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
unittest2 unittest2
[tox:jenkins] [tox:jenkins]