diff --git a/requirements.txt b/requirements.txt index aeb7883b283a..341a41e46dc6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,32 +1,31 @@ -d2to1>=0.2.10,<0.3 -pbr>=0.5.16,<0.6 -SQLAlchemy>=0.7.8,<0.7.99 +pbr>=0.5.21,<1.0 +SQLAlchemy>=0.7.8,<=0.7.99 amqplib>=0.6.1 -anyjson>=0.2.4 +anyjson>=0.3.3 argparse -boto -eventlet>=0.9.17 +boto>=2.4.0 +eventlet>=0.13.0 Jinja2 -kombu>=1.0.4 +kombu>=2.4.8 lxml>=2.3 -routes>=1.12.3 -WebOb==1.2.3 -greenlet>=0.3.1 +Routes>=1.12.3 +WebOb>=1.2.3,<1.3 +greenlet>=0.3.2 PasteDeploy>=1.5.0 -paste +Paste sqlalchemy-migrate>=0.7.2 -netaddr>=0.7.6 +netaddr suds>=0.4 -paramiko +paramiko>=1.8.0 pyasn1 Babel>=0.9.6 iso8601>=0.1.4 jsonschema>=1.3.0,!=1.4.0 -python-cinderclient>=1.0.1 -python-neutronclient>=2.3.0,<3.0.0 +python-cinderclient>=1.0.5 +python-neutronclient>=2.3.0,<3 python-glanceclient>=0.9.0 -python-keystoneclient>=0.2.0 -six +python-keystoneclient>=0.3.2 +six<1.4.0 stevedore>=0.10 websockify>=0.5.1,<0.6 diff --git a/setup.py b/setup.py index 1e9882df0ed2..70c2b3f32bd6 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>=0.2.10,<0.3', 'pbr>=0.5,<0.6'], - d2to1=True) + setup_requires=['pbr'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 32b6f1b80d0e..798971299356 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,15 +2,14 @@ hacking>=0.5.6,<0.8 coverage>=3.6 discover feedparser -fixtures>=0.3.12 +fixtures>=0.3.14 mock>=1.0 -mox==0.5.3 +mox>=0.5.3 MySQL-python psycopg2 pylint==0.25.2 python-subunit -setuptools_git>=0.4 sphinx>=1.1.2 oslo.sphinx -testrepository>=0.0.13 -testtools>=0.9.27 +testrepository>=0.0.17 +testtools>=0.9.32