summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-07-23 04:58:34 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-07-23 04:58:34 +0000
commitf66d9c86f67154b615194bc034f89d8a1d91bd13 (patch)
tree237b9df0482a342cc262d6658372e99d8fb2c1f1
parent88277a07d304a1f88fc08d44917852a46e2bd857 (diff)
downloadoslo-db-f66d9c86f67154b615194bc034f89d8a1d91bd13.tar.gz
Updated from global requirements
Change-Id: Icaf116a2eafad4ce34a26879d4f19b66cac62506
-rw-r--r--requirements.txt12
-rw-r--r--[-rwxr-xr-x]setup.py1
-rw-r--r--test-requirements-py2.txt16
-rw-r--r--test-requirements-py3.txt18
4 files changed, 23 insertions, 24 deletions
diff --git a/requirements.txt b/requirements.txt
index 8350f43..006198c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,16 +2,16 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-pbr>=0.6,!=0.7,<1.0
+pbr!=0.7,<1.0,>=0.6
alembic>=0.7.2
Babel>=1.3
iso8601>=0.1.9
-oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0
-oslo.config>=1.9.3,<1.10.0 # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
-SQLAlchemy>=0.9.7,<=0.9.99
+oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
+oslo.config<1.10.0,>=1.9.3 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+SQLAlchemy<=0.9.99,>=0.9.7
sqlalchemy-migrate>=0.9.5
-stevedore>=1.3.0,<1.4.0 # Apache-2.0
+stevedore<1.4.0,>=1.3.0 # Apache-2.0
six>=1.9.0
testresources>=0.2.4
testscenarios>=0.4
diff --git a/setup.py b/setup.py
index 7363757..056c16c 100755..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-py2.txt b/test-requirements-py2.txt
index 24c3b46..d987604 100644
--- a/test-requirements-py2.txt
+++ b/test-requirements-py2.txt
@@ -2,18 +2,18 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking>=0.9.2,<0.10
+hacking<0.10,>=0.9.2
coverage>=3.6
discover
-doc8 # Apache-2.0
-fixtures>=0.3.14
+doc8 # Apache-2.0
+fixtures<1.3.0,>=0.3.14
MySQL-python
psycopg2
python-subunit>=0.0.18
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.5.0,<2.6.0 # Apache-2.0
-oslotest>=1.5.1,<1.6.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
+oslotest<1.6.0,>=1.5.1 # Apache-2.0
testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
-tempest-lib>=0.4.0
+testtools!=1.2.0,>=0.9.36
+tempest-lib<0.5.0,>=0.4.0
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
index 6ca989c..db478e6 100644
--- a/test-requirements-py3.txt
+++ b/test-requirements-py3.txt
@@ -2,18 +2,18 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking>=0.9.2,<0.10
+hacking<0.10,>=0.9.2
coverage>=3.6
discover
-doc8 # Apache-2.0
-fixtures>=0.3.14
+doc8 # Apache-2.0
+fixtures<1.3.0,>=0.3.14
psycopg2
python-subunit>=0.0.18
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.5.0,<2.6.0 # Apache-2.0
-oslotest>=1.5.1,<1.6.0 # Apache-2.0
-PyMySQL>=0.6.2 # MIT License
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
+oslotest<1.6.0,>=1.5.1 # Apache-2.0
+PyMySQL>=0.6.2 # MIT License
testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
-tempest-lib>=0.4.0
+testtools!=1.2.0,>=0.9.36
+tempest-lib<0.5.0,>=0.4.0