summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Riedemann <mriedem@us.ibm.com>2015-09-15 08:11:21 -0700
committerMatt Riedemann <mriedem@us.ibm.com>2015-09-15 08:11:34 -0700
commit7eeccd87699acd11b93058bd4e4cbeb801c70986 (patch)
tree9744565820eb3b19cd11d8ab0243798b68cc5cd1
parent91dc782c2f11fb76425effd7a331d63111adf1ce (diff)
downloadoslo-utils-7eeccd87699acd11b93058bd4e4cbeb801c70986.tar.gz
Updated from global requirements1.4.1
This is needed to cap oslo.i18n on stable/juno and then release this as 1.4.1. The 1.4.0 version used in stable/juno doesn't work today because it has uncapped oslo.i18n which breaks other libraries and projects which have capped oslo.i18n. Update .gitreview since this is the first change on the stable/juno branch. Closes-Bug: #1488746 Change-Id: Ia10387c43a21fa9574d966ad60f42778eb95d0d1
-rw-r--r--.gitreview3
-rw-r--r--requirements.txt14
-rw-r--r--[-rwxr-xr-x]setup.py1
-rw-r--r--test-requirements.txt24
4 files changed, 21 insertions, 21 deletions
diff --git a/.gitreview b/.gitreview
index b22853d..0f01912 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,5 @@
[gerrit]
host=review.openstack.org
port=29418
-project=openstack/oslo.utils.git \ No newline at end of file
+project=openstack/oslo.utils.git
+defaultbranch=stable/juno
diff --git a/requirements.txt b/requirements.txt
index be23276..6350214 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,10 +2,10 @@
# 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
-Babel>=1.3
-six>=1.9.0
-iso8601>=0.1.9
-oslo.i18n>=1.3.0 # Apache-2.0
-netaddr>=0.7.12
-netifaces>=0.10.4
+pbr!=0.7,<1.0,>=0.6
+Babel<=1.3,>=1.3
+six<=1.9.0,>=1.7.0
+iso8601<=0.1.10,>=0.1.9
+oslo.i18n<=1.3.1,>=1.0.0 # Apache-2.0
+netaddr<=0.7.13,>=0.7.12
+netifaces<=0.10.4,>=0.10.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.txt b/test-requirements.txt
index 0fab2b3..c129b35 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,24 +2,24 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking>=0.9.1,<0.10
+hacking<0.10,>=0.9.1
-discover
-fixtures>=0.3.14
-python-subunit>=0.0.18
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
-oslotest>=1.2.0 # Apache-2.0
+discover<=0.4.0
+fixtures<=1.0.0,>=0.3.14
+python-subunit<=1.0.0,>=0.0.18
+testrepository<=0.0.20,>=0.0.18
+testscenarios<=0.4,>=0.4
+testtools!=1.4.0,<=1.5.0,>=0.9.34
+oslotest<1.4.0,>=1.1.0 # Apache-2.0
# when we can require tox>= 1.4, this can go into tox.ini:
# [testenv:cover]
# deps = {[testenv]deps} coverage
-coverage>=3.6
+coverage<=3.7.1,>=3.6
# this is required for the docs build jobs
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.2.0 # Apache-2.0
+sphinx!=1.2.0,<1.3,>=1.1.2
+oslosphinx<2.5.0,>=2.2.0 # Apache-2.0
# mocking framework
-mock>=1.0
+mock<=1.0.1,>=1.0