diff options
author | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2015-06-22 08:27:27 +0000 |
---|---|---|
committer | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2015-06-22 08:27:27 +0000 |
commit | 12fcfb877a405e0d08bbd98e6285ca24efa5b39a (patch) | |
tree | b466d691a72da4140ad4810d03a222e4cdf9f414 | |
parent | bcd8446a8e154d8ebc0f8ae3b8c77b4d470c8043 (diff) | |
download | oslotest-12fcfb877a405e0d08bbd98e6285ca24efa5b39a.tar.gz |
Updated from global requirements
Change-Id: I624b949e5075096e4cce8533ad63a7b5f4b1131b
-rw-r--r-- | requirements.txt | 2 | ||||
-rw-r--r-- | setup.py | 1 | ||||
-rw-r--r-- | test-requirements.txt | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/requirements.txt b/requirements.txt index 1486ede..31ba94a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ python-subunit>=0.0.18 six>=1.9.0 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 mock>=1.0 mox3>=0.7.0 os-client-config>=1.2.0 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/test-requirements.txt b/test-requirements.txt index d6f80b3..192ca49 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=0.10.0,<0.11 +hacking<0.11,>=0.10.0 # when we can require tox>= 1.4, this can go into tox.ini: # [testenv:cover] @@ -10,5 +10,5 @@ hacking>=0.10.0,<0.11 coverage>=3.6 # this is required for the docs build jobs -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.5.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 |