diff options
| author | Morgan Fainberg <m@metacloud.com> | 2013-12-10 14:06:45 -0800 |
|---|---|---|
| committer | John Dickinson <me@not.mn> | 2013-12-10 17:06:20 -0800 |
| commit | ddd8c7358dc6ba285f2f330998f97655575a5676 (patch) | |
| tree | 72a547c6198860e10b830041e6074a195b85d701 | |
| parent | 038878b1a4eeb8ec94faf3a6285b43beb49a190c (diff) | |
| download | swift-1.11.0.tar.gz | |
Sync global requirements to pin sphinx to sphinx>=1.1.2,<1.21.11.0
Sync the global requirements to pin sphinx. This addresses an issue
where Sphinx 1.2 is not building documents correctly and causing
check/gate to fail.
We also had to adjust the pip command used.
Change-Id: I8894c0199db845e90e5086a7c0e6bb7c7a26b5a0
| -rw-r--r-- | test-requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test-requirements.txt b/test-requirements.txt index fdebbb6e4..9ff8d1c68 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,5 +8,5 @@ nose nosexcover openstack.nose_plugin nosehtmloutput -sphinx>=1.1.2 +sphinx>=1.1.2,<1.2 mock>=0.8.0 @@ -2,6 +2,7 @@ envlist = py26,py27,pep8 [testenv] +install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} NOSE_WITH_OPENSTACK=1 NOSE_OPENSTACK_COLOR=1 |