summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--requirements.txt36
-rw-r--r--setup.py1
-rw-r--r--test-requirements.txt13
3 files changed, 25 insertions, 25 deletions
diff --git a/requirements.txt b/requirements.txt
index cd12eb9f..8bb13431 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,12 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-pbr>=0.11,<2.0
-SQLAlchemy>=0.9.7,<=0.9.99
-eventlet>=0.17.3
+pbr<2.0,>=0.11
+SQLAlchemy<1.1.0,>=0.9.7
+eventlet>=0.17.4
keystonemiddleware>=1.5.0
kombu>=3.0.7
-Routes>=1.12.3,!=2.0
+Routes!=2.0,>=1.12.3
WebOb>=1.2.3
PasteDeploy>=1.5.0
Paste
@@ -18,23 +18,23 @@ lxml>=2.3
passlib
python-heatclient>=0.3.0
python-novaclient>=2.22.0
-python-cinderclient>=1.2.1
+python-cinderclient>=1.2.2
python-keystoneclient>=1.6.0
python-swiftclient>=2.2.0
python-designateclient>=1.0.0
-python-neutronclient>=2.3.11,<3
+python-neutronclient<3,>=2.3.11
iso8601>=0.1.9
-jsonschema>=2.0.0,<3.0.0,!=2.5.0
-Jinja2>=2.6 # BSD License (3 clause)
-pexpect>=3.1,!=3.3 # ISC License
-oslo.config>=1.11.0 # Apache-2.0
-oslo.i18n>=1.5.0 # Apache-2.0
-oslo.serialization>=1.4.0 # Apache-2.0
-oslo.utils>=1.4.0 # Apache-2.0
-oslo.concurrency>=2.0.0 # Apache-2.0
-MySQL-python
+jsonschema!=2.5.0,<3.0.0,>=2.0.0
+Jinja2>=2.6 # BSD License (3 clause)
+pexpect!=3.3,>=3.1 # ISC License
+oslo.config>=1.11.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils>=1.6.0 # Apache-2.0
+oslo.concurrency>=2.1.0 # Apache-2.0
+MySQL-python;python_version=='2.7'
Babel>=1.3
six>=1.9.0
-stevedore>=1.3.0 # Apache-2.0
-oslo.messaging>=1.8.0 # Apache-2.0
-osprofiler>=0.3.0 # Apache-2.0
+stevedore>=1.5.0 # Apache-2.0
+oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
+osprofiler>=0.3.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index 73637574..056c16c2 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/test-requirements.txt b/test-requirements.txt
index d3fa398d..0a5d657c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,22 +2,23 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
# Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.10.0,<0.11
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.5.0 # Apache-2.0
+hacking<0.11,>=0.10.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx>=2.5.0 # Apache-2.0
coverage>=3.6
nose
nosexcover
openstack-doc-tools>=0.23
-openstack.nose_plugin>=0.7
+openstack.nose-plugin>=0.7
WebTest>=2.0
-wsgi_intercept>=0.6.1 # MIT License
+wsgi-intercept>=0.6.1 # MIT License
proboscis>=1.2.5.3
http://tarballs.openstack.org/python-troveclient/python-troveclient-master.tar.gz#egg=python-troveclient
+
mock>=1.0
mox3>=0.7.0
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
discover
testrepository>=0.0.18