summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-06-22 08:28:59 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-06-22 08:28:59 +0000
commit061a2efc71ccce9024f86517edccdb4c82d416bc (patch)
treefa9c14c562c515f33674fb74e95cb33baeb12eb5
parent8c26c5c050a6f4597165f996d0db813a89f4f216 (diff)
downloadtempest-lib-061a2efc71ccce9024f86517edccdb4c82d416bc.tar.gz
Updated from global requirements
Change-Id: Idb49f98289f9c392abc2d99bf36b9d6bd095dcc5
-rw-r--r--requirements.txt6
-rw-r--r--[-rwxr-xr-x]setup.py1
-rw-r--r--test-requirements.txt10
3 files changed, 8 insertions, 9 deletions
diff --git a/requirements.txt b/requirements.txt
index 889f318..918133f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,13 @@
# 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
+pbr<2.0,>=0.11
Babel>=1.3
fixtures>=0.3.14
iso8601>=0.1.9
-jsonschema>=2.0.0,<3.0.0
+jsonschema!=2.5.0,<3.0.0,>=2.0.0
httplib2>=0.7.5
paramiko>=1.13.0
six>=1.9.0
-oslo.log>=1.0.0 # Apache-2.0
+oslo.log>=1.2.0 # Apache-2.0
os-testr>=0.1.0
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.txt b/test-requirements.txt
index 7986677..5c55f68 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,11 +7,11 @@ hacking<0.11,>=0.10.0
coverage>=3.6
discover
python-subunit>=0.0.18
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.5.0 # Apache-2.0
-oslotest>=1.5.1 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx>=2.5.0 # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0
testrepository>=0.0.18
testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
mock>=1.0
-ddt>=0.4.0
+ddt>=0.7.0