openstack/swift
Code Issues Proposed changes

Sync global requirements to pin sphinx to sphinx>=1.1.2,<1.2

Browse Source 
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
This commit is contained in:
Morgan Fainberg 2013-12-10 14:06:45 -08:00 committed by Peter Portante
parent ba5fe5f39e
commit 9a2bd79073
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-requirements.txt
View File

@ -8,5 +8,5 @@ nose
nosexcover nosexcover
openstack.nose_plugin openstack.nose_plugin
nosehtmloutput nosehtmloutput
sphinx>=1.1.2 sphinx>=1.1.2,<1.2
mock>=0.8.0 mock>=0.8.0

1
tox.ini
View File

@ -2,6 +2,7 @@
envlist = py26,py27,pep8 envlist = py26,py27,pep8
[testenv] [testenv]
install_command = pip install -U {opts} {packages}
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
NOSE_WITH_OPENSTACK=1 NOSE_WITH_OPENSTACK=1
NOSE_OPENSTACK_COLOR=1 NOSE_OPENSTACK_COLOR=1