Sync with global requirements

Get requirements in sync with global requirements again.
As this updates hacking to a more recent version, add
some blacklisting of hacking warnings to tox.ini to
get the gate passing. Those will be cleaned up
in followup commits.

Change-Id: I18f956d999db21be197ce35044623eaa22ed4185
This commit is contained in:
Dirk Mueller
2014-05-27 09:45:10 +02:00
parent 30b5fbefd0
commit 6f892ed590
4 changed files with 32 additions and 18 deletions

View File

@@ -1,28 +1,28 @@
pbr>=0.5.21,<1.0 pbr>=0.6,!=0.7,<1.0
anyjson>=0.3.3 anyjson>=0.3.3
argparse argparse
Babel>=1.3 Babel>=1.3
eventlet>=0.13.0 eventlet>=0.13.0
greenlet>=0.3.2 greenlet>=0.3.2
iso8601>=0.1.8 iso8601>=0.1.9
kombu>=2.4.8 kombu>=2.4.8
lockfile>=0.8 lockfile>=0.8
lxml>=2.3 lxml>=2.3
oslo.config>=1.2.0 oslo.config>=1.2.1
oslo.messaging>=1.3.0 oslo.messaging>=1.3.0
paramiko>=1.8.0 paramiko>=1.13.0
Paste Paste
PasteDeploy>=1.5.0 PasteDeploy>=1.5.0
posix_ipc posix_ipc
python-neutronclient>=2.3.0,<3 python-neutronclient>=2.3.5,<3
python-keystoneclient>=0.3.2 python-keystoneclient>=0.9.0
Routes>=1.12.3 Routes>=1.12.3,!=2.0
six>=1.6.0 six>=1.7.0
SQLAlchemy>=0.7.8,<=0.7.99 SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
sqlalchemy-migrate>=0.7.2 sqlalchemy-migrate>=0.9.1
stevedore>=0.10 stevedore>=0.14
python-cinderclient>=1.0.6 python-cinderclient>=1.0.7
python-novaclient>=2.15.0 python-novaclient>=2.17.0
suds>=0.4 suds>=0.4
WebOb>=1.2.3,<1.3 WebOb>=1.2.3
wsgiref>=0.1.2 wsgiref>=0.1.2

View File

@@ -17,6 +17,14 @@
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools 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( setuptools.setup(
setup_requires=['pbr'], setup_requires=['pbr'],
pbr=True) pbr=True)

View File

@@ -1,4 +1,4 @@
hacking>=0.8.0,<0.9 hacking>=0.9.2,<0.10
coverage>=3.6 coverage>=3.6
fixtures>=0.3.14 fixtures>=0.3.14
@@ -9,5 +9,5 @@ nosehtmloutput>=0.0.3
nosexcover nosexcover
openstack.nose_plugin>=0.7 openstack.nose_plugin>=0.7
psycopg2 psycopg2
sphinx>=1.2.1,<1.3 sphinx>=1.1.2,!=1.2.0,<1.3
testtools>=0.9.32,<0.9.35 testtools>=0.9.34

View File

@@ -41,7 +41,13 @@ commands = bash tools/lintstack.sh
[flake8] [flake8]
# TODO: These are not intentionally disabled, reenable when fixed: # TODO: These are not intentionally disabled, reenable when fixed:
# H236: Python 3.x incompatible __metaclass__, use six.add_metaclass()
# H237: module is removed in Python 3
# H305: imports not grouped correctly
# H307: like imports should be grouped together
# H405: multi line docstring summary not separated with an empty line
# H501: Do not use locals() for string formatting # H501: Do not use locals() for string formatting
ignore = E12,E711,E712,H302,H303,H304,H402,H404,H501,F # H904: Wrap long lines in parentheses instead of a backslash
ignore = E12,E711,E712,H236,H237,H302,H303,H304,H305,H307,H402,H404,H405,H501,H904,F
builtins = _ builtins = _
exclude = .venv,.tox,dist,doc,openstack,*egg exclude = .venv,.tox,dist,doc,openstack,*egg