From 8f74e2ba283c2a8ed757088d706c5e02afbe6a73 Mon Sep 17 00:00:00 2001 From: Lance Bragstad Date: Fri, 29 Jun 2018 22:17:47 +0000 Subject: Fix requirements and convert to stestr This commit fixes two issues that are currently blocking the gate. The first is that it bumps the Sphinx requirement to be within acceptable constraints. The second is that it converts oslo.policy to use stestr instead of testr. This is all being done in one patch because proposing them individually causes deadlock (the patch to bump the sphinx requirement fails because we're still using testr and the patch to convert to stestr fails the requirements-check job). The following explains the reasoning behind the stestr change. With the upgrade to oslotest 3.6.0 [0], testr no longer works [1]. This is because oslotest no longer requires testr and we don't depend on it directly in oslo.policy. [0] https://github.com/openstack/requirements/commit/d5a3c58f7195517a6083032e41b702c2a0aca431 [1] https://github.com/openstack/oslotest/commit/897823fbd61ae9ba015af38e9fed5a5728de64c2 Change-Id: I6dac4c8e7b39c9b80cc8f3728763e8d783c9e940 --- test-requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test-requirements.txt') diff --git a/test-requirements.txt b/test-requirements.txt index 704e603..d8db8f7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,13 +4,14 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 requests-mock>=1.1.0 # Apache-2.0 +stestr>=2.0.0 # Apache-2.0 # computes code coverage percentages coverage!=4.4,>=4.0 # Apache-2.0 # These are needed for docs generation openstackdocstheme>=1.18.1 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD +sphinx!=1.6.6,!=1.6.7,>=1.6.5 # BSD reno>=2.5.0 # Apache-2.0 -- cgit v1.2.1