diff --git a/requirements.txt b/requirements.txt index 1b9f5dcd2..266260b10 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,18 @@ -d2to1>=0.2.10,<0.3 -pbr>=0.5.16,<0.6 +pbr>=0.5.21,<1.0 -babel +Babel>=0.9.6 netaddr -falcon>=0.1.6,<0.1.8 +falcon>=0.1.6,<0.1.7 iso8601>=0.1.4 msgpack-python -pymongo -python-keystoneclient +pymongo>=2.4 +python-keystoneclient>=0.3.2 python-memcached redis -simplejson -WebOb -stevedore>=0.9 -six>=1.4.1 # NOTE(cpp-cabrera): needed for add_metaclass +simplejson>=2.0.9 +WebOb>=1.2.3,<1.3 +stevedore>=0.10 +six -f http://tarballs.openstack.org/oslo.config/oslo.config-1.2.0a4.tar.gz#egg=oslo.config-1.2.0a4 -oslo.config>=1.2.0a4 +oslo.config>=1.1.0 diff --git a/setup.cfg b/setup.cfg index f099b1afe..3a7d81da4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,6 @@ [metadata] name = marconi +version = 2013.2 summary = OpenStack Queuing and Notification Service description-file = README.rst @@ -21,10 +22,6 @@ classifier = packages = marconi -[global] -setup-hooks = - pbr.hooks.setup_hook - [entry_points] console_scripts = marconi-gc = marconi.cmd.gc:run diff --git a/setup.py b/setup.py index 097e33d89..70c2b3f32 100755 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (c) 2013 Red Hat, Inc. +# 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. @@ -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>=0.2.10,<0.3', 'pbr>=0.5.16,<0.6'], - d2to1=True) + setup_requires=['pbr'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 132fbc384..d6d45735b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,22 +1,21 @@ +# Metrics and style +hacking>=0.5.6,<0.8 + # Packaging -mock -distribute>=0.6.24 +mock>=1.0 # Unit testing -ddt +ddt>=0.4.0 discover -fixtures +fixtures>=0.3.14 python-subunit -testrepository -testtools +testrepository>=0.0.17 +testtools>=0.9.32 # Functional Tests -requests +requests>=1.1 # Test runner nose nose-exclude -openstack.nose_plugin - -# Metrics and style -hacking +openstack.nose_plugin>=0.7 diff --git a/tox.ini b/tox.ini index 9b352fb91..6bcfef640 100644 --- a/tox.ini +++ b/tox.ini @@ -19,7 +19,6 @@ deps = -r{toxinidir}/requirements.txt commands = nosetests {posargs} [tox:jenkins] -sitepackages = True downloadcache = ~/cache/pip [testenv:pep8]