summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-06-22 08:27:14 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2015-06-22 08:27:14 +0000
commitf34ee8a3f53aa2289c9d86a746b36d9e72b88e72 (patch)
tree94e217122b9eff27c52a2796e7cb6cf61db73297
parent293def2d236d60ecd265314850aaae350ef95b6a (diff)
downloadoslo-rootwrap-f34ee8a3f53aa2289c9d86a746b36d9e72b88e72.tar.gz
Updated from global requirements
Change-Id: Ied82c59bcd5f2766f497da35990cf5eca5dc9617
-rw-r--r--setup.py1
-rw-r--r--test-requirements-py3.txt6
-rw-r--r--test-requirements.txt10
3 files changed, 8 insertions, 9 deletions
diff --git a/setup.py b/setup.py
index 7363757..056c16c 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-py3.txt b/test-requirements-py3.txt
index 48bbf97..aee21a1 100644
--- a/test-requirements-py3.txt
+++ b/test-requirements-py3.txt
@@ -2,14 +2,14 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
discover
fixtures>=0.3.14
python-subunit>=0.0.18
testrepository>=0.0.18
testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
# when we can require tox>= 1.4, this can go into tox.ini:
# [testenv:cover]
@@ -23,5 +23,5 @@ mock>=1.0
# not available for Python 3.x
# eventlet>=0.13.0
-oslotest>=1.5.1 # Apache-2.0
+oslotest>=1.5.1 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index c58602d..fe606e1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,19 +2,19 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
discover
fixtures>=0.3.14
python-subunit>=0.0.18
testrepository>=0.0.18
testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0
+testtools>=1.4.0
# this is required for the docs build jobs
-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
# mocking framework