diff --git a/requirements.txt b/requirements.txt index 485178bb..81fa477e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,17 @@ -Babel>=0.9.6 -eventlet>=0.9.17 -fixtures>=0.3.12 -iso8601>=0.1.4 -jsonschema>=2.0.0 +Babel>=1.3 +eventlet>=0.13.0 +fixtures>=0.3.14 +iso8601>=0.1.8 +jsonschema>=1.3.0,!=1.4.0 netaddr>=0.7.6 oslo.config>=1.2.0 paramiko>=1.8.0 pbr>=0.5.21,<1.0 -PrettyTable>=0.6,<0.8 +PrettyTable>=0.7,<0.8 python-glanceclient>=0.9.0 python-keystoneclient>=0.4.1 python-novaclient>=2.15.0 python-neutronclient>=2.3.0,<3 python-cinderclient>=1.0.6 -SQLAlchemy>=0.7.8,<0.7.99 -six +SQLAlchemy>=0.7.8,<=0.7.99 +six>=1.4.1 diff --git a/setup.py b/setup.py index 6559398d..70c2b3f3 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,22 @@ #!/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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# 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>=0.5.21,<1.0'], + setup_requires=['pbr'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 6e006c87..7db10da8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,12 +1,12 @@ # Install bounded pep8/pyflakes first, then let flake8 install pep8==1.4.5 -pyflakes==0.7.2 +pyflakes>=0.7.2,<0.7.4 flake8==2.0 -hacking>=0.6,<0.8 +hacking>=0.8.0,<0.9 -coverage +coverage>=3.6 discover mock>=1.0 -python-subunit<=0.0.13 -testrepository>=0.0.13 -testtools>=0.9.22 +python-subunit +testrepository>=0.0.17 +testtools>=0.9.32 diff --git a/tox.ini b/tox.ini index cea1399d..689305d3 100644 --- a/tox.ini +++ b/tox.ini @@ -35,4 +35,4 @@ builtins = _ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools [hacking] -import_exceptions = openstack.common.gettextutils._ +import_exceptions = rally.openstack.common.gettextutils._