diff --git a/doc-requirements.txt b/doc-requirements.txt new file mode 100644 index 0000000000..be3b93fe60 --- /dev/null +++ b/doc-requirements.txt @@ -0,0 +1,12 @@ +actdiag +blockdiag +docutils==0.11 +nwdiag +oslosphinx +seqdiag +sphinx +sphinxcontrib-actdiag +sphinxcontrib-blockdiag +sphinxcontrib-nwdiag +sphinxcontrib-seqdiag +graphviz diff --git a/requirements.txt b/requirements.txt index a200003e85..7de542d49f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,43 +1,33 @@ -actdiag +# 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. alembic>=0.7.1 -blockdiag -docutils==0.11 -nwdiag -oslosphinx -pecan>=0.7.0 -pbr>=0.6,<1.0 -seqdiag -sphinx -sphinxcontrib-actdiag -sphinxcontrib-blockdiag -sphinxcontrib-nwdiag -sphinxcontrib-seqdiag -SQLAlchemy>=0.7.8,<=0.9.99 -graphviz - +pecan>=0.8.0 +pbr>=0.6,!=0.7,<1.0 +SQLAlchemy>=0.9.7,<=0.9.99 anyjson>=0.3.3 Babel>=1.3 -eventlet>=0.13.0 -requests>=1.2.1 +eventlet>=0.15.2 +requests>=2.2.0,!=2.4.0 jsonrpclib -netaddr>=0.7.6 +netaddr>=0.7.12 python-neutronclient>=2.3.6,<3 WebOb>=1.2.3 six>=1.7.0 -oslo.config>=1.4.0 # Apache-2.0 -oslo.db>=1.1.0 # Apache-2.0 +oslo.config>=1.6.0 # Apache-2.0 +oslo.db>=1.3.0 # Apache-2.0 oslo.i18n>=1.0.0 # Apache-2.0 -oslo.messaging>=1.4.0 -oslo.middleware>=0.1.0 # Apache-2.0 +oslo.messaging>=1.4.0,!=1.5.0 +oslo.middleware>=0.3.0 # Apache-2.0 oslo.rootwrap>=1.3.0 -oslo.serialization>=1.0.0 # Apache-2.0 -oslo.utils>=1.0.0 # Apache-2.0 -PyMySQL>=0.6.3 -python-barbicanclient>=3.0 +oslo.serialization>=1.2.0 # Apache-2.0 +oslo.utils>=1.2.0 # Apache-2.0 +PyMySQL>=0.6.2 # MIT License +python-barbicanclient>=2.1.0,!=3.0.0 python-keystoneclient>=0.11.1 -python-novaclient>=2.17.0 +python-novaclient>=2.18.0 posix_ipc -pyOpenSSL>=0.14 -wsme==0.6.1 +pyOpenSSL>=0.11 +WSME>=0.6 pyasn1 pyasn1_modules diff --git a/setup.py b/setup.py index b96f524bb6..736375744d 100755 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (c) 2014 eNovance +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,8 +14,17 @@ # See the License for the specific language governing permissions and # limitations under the License. +# 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'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 677127fcbf..aa57c1ba4a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,14 +1,17 @@ +# 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. hacking>=0.9.1,<0.10 -cliff>=1.6.0 +cliff>=1.7.0 # Apache-2.0 coverage>=3.6 discover fixtures>=0.3.14 mock>=1.0 python-subunit>=0.0.18 ordereddict -oslotest==1.0.0 +oslotest>=1.2.0 # Apache-2.0 testrepository>=0.0.18 -testtools>=0.9.34 +testtools>=0.9.36,!=1.2.0 WebTest>=2.0 doc8 diff --git a/tox.ini b/tox.ini index e72cc5485c..df4921c50f 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,7 @@ setenv = VIRTUAL_ENV={envdir} install_command = pip install -U {opts} {packages} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt + -r{toxinidir}/doc-requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}' [testenv:pep8]