From dc7adefc822e51955c433bdd00ef4d44d78bd827 Mon Sep 17 00:00:00 2001 From: Alejandro Cabrera Date: Tue, 18 Mar 2014 11:56:32 -0400 Subject: [PATCH] fix(gate): one for pypy, one for docs Drop the version requirement for setuptools w/ tox:pypy to workaround: https://bugs.launchpad.net/openstack-ci/+bug/1290562 Also add in sphinx-reqs to make the docs gate happy. Change-Id: I5ac510373809733129401b51ad39579d2963fab2 --- test-requirements.txt | 4 ++++ tox.ini | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/test-requirements.txt b/test-requirements.txt index cf8f0ccb2..45428031a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -15,3 +15,7 @@ testtools>=0.9.34 # Functional Tests requests>=1.1 + +# Documentation +sphinx>=1.1.2,<1.2 +oslo.sphinx diff --git a/tox.ini b/tox.ini index 2ebf09e8a..9281761f7 100644 --- a/tox.ini +++ b/tox.ini @@ -19,6 +19,11 @@ commands = python setup.py testr --slowest --testr-args='--concurrency 1 {posarg [tox:jenkins] downloadcache = ~/cache/pip +[testenv:pypy] +deps = setuptools<3.2 + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt + [testenv:pep8] commands = flake8