Updated from global requirements

Change-Id: Iac7b6d2a116fda68a8b5c7106b5a66119ece70a2
This commit is contained in:
OpenStack Proposal Bot
2015-11-27 22:42:22 +00:00
parent bc1347482a
commit 1e5f018ad8
3 changed files with 12 additions and 5 deletions

View File

@@ -4,5 +4,5 @@
pbr>=1.6
Babel>=1.3
requests>=2.5.2,!=2.8.0
requests>=2.8.1
six>=1.9.0

11
setup.py Executable file → Normal file
View File

@@ -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");
@@ -17,6 +16,14 @@
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
# In python < 2.7.4, a lazy loading of package `pbr` will break
# setuptools if some other modules registered functions in `atexit`.
# solution from: http://bugs.python.org/issue15881#msg170215
try:
import multiprocessing # noqa
except ImportError:
pass
setuptools.setup(
setup_requires=['pbr'],
setup_requires=['pbr>=1.8'],
pbr=True)

View File

@@ -8,14 +8,14 @@ discover
fixtures>=1.3.1
mock>=1.2
python-subunit>=0.0.18
oslotest>=1.1.0.0a1
oslotest>=1.10.0 # Apache-2.0
testrepository>=0.0.18
testscenarios>=0.4
testtools>=1.4.0
# HTTPretty test hanging on Travis
# http://stackoverflow.com/questions/29298455/httpretty-test-hanging-on-travis
# httpretty 0.8.6 seems ok
httpretty!=0.8.1,!=0.8.2,!=0.8.3,!=0.8.7,!=0.8.8,>=0.8.0
httpretty<0.8.7,>=0.8.4
# Doc requirements
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2