From 50ad1e0b14b93873cbab6f0f7a8cc70da23bd36f Mon Sep 17 00:00:00 2001 From: John Dickinson Date: Wed, 11 Dec 2013 16:17:16 -0800 Subject: [PATCH] Fix Sphinx version issue Change-Id: Ib72ebf210486972538f5d2ef7eb225d57f84eeac --- test-requirements.txt | 2 +- tox.ini | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 5b78b5f..6458abf 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,6 +4,6 @@ coverage>=3.6 discover mock>=1.0 python-keystoneclient>=0.3.2 -sphinx>=1.1.2 +sphinx>=1.1.2,<1.2 testrepository>=0.0.17 testtools>=0.9.32 diff --git a/tox.ini b/tox.ini index 0a157c2..58631d3 100644 --- a/tox.ini +++ b/tox.ini @@ -2,6 +2,7 @@ envlist = py26,py27,py33,pypy,pep8 [testenv] +install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} LANG=en_US.UTF-8 LANGUAGE=en_US:en