diff --git a/requirements.txt b/requirements.txt index c371d94..786782a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ -anyjson +pbr>=0.5.21,<1.0 + +anyjson>=0.3.3 argparse -d2to1 -eventlet>=0.12.0 -python-keystoneclient -requests +eventlet>=0.13.0 +python-keystoneclient>=0.3.2 +requests>=1.1 iso8601>=0.1.4 lxml>=2.3 oslo.config>=1.1.0 -pbr -six +six<1.4.0 diff --git a/setup.py b/setup.py index 59a0090..70c2b3f 100644 --- a/setup.py +++ b/setup.py @@ -14,8 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools setuptools.setup( - setup_requires=['d2to1', 'pbr'], - d2to1=True) + setup_requires=['pbr'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index f2d5b26..0a65a00 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,9 +1,9 @@ coverage>=3.6 discover fixtures>=0.3.14 -hacking +hacking>=0.5.6,<0.8 python-subunit sphinx>=1.1.2 -testrepository>=0.0.13 -testscenarios -testtools>=0.9.27 +testrepository>=0.0.17 +testscenarios>=0.4 +testtools>=0.9.32