diff --git a/requirements.txt b/requirements.txt index 047a8ffc..bc6a0d47 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -pbr>=0.5.21,<1.0 +pbr>=0.6,<1.0 requests>=1.1 six>=1.4.1 -stevedore>=0.12 -jsonschema>=1.3.0,!=1.4.0 +stevedore>=0.14 +jsonschema>=2.0.0,<3.0.0 -python-keystoneclient>=0.4.1 +python-keystoneclient>=0.6.0 diff --git a/setup.py b/setup.py index 32515155..70c2b3f3 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,5 @@ -#!/usr/bin/python -# -*- encoding: utf-8 -*- -# Copyright (c) 2013 OpenStack, LLC. +#!/usr/bin/env python +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,9 +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=['pbr'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index ecd5face..bd5c683b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,9 +4,9 @@ hacking>=0.8.0,<0.9 discover fixtures>=0.3.14 mock>=1.0 -python-subunit -testrepository>=0.0.17 -testtools>=0.9.32 +python-subunit>=0.0.18 +testrepository>=0.0.18 +testtools>=0.9.34 # Test runner nose nose-exclude