diff --git a/requirements.txt b/requirements.txt index 09895412..08232b5d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,7 @@ -pbr>=0.5.21,<1.0 +# 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. +pbr>=0.6,!=0.7,<1.0 anyjson>=0.3.3 argparse @@ -6,20 +9,20 @@ Babel>=1.3 # The egg=tripleo-heat-templates suffix is needed by pbr's requirements # processing code http://tarballs.openstack.org/tripleo-heat-templates/tripleo-heat-templates-master.tar.gz#egg=tripleo_heat_templates -eventlet>=0.13.0 +eventlet>=0.15.1 greenlet>=0.3.2 -iso8601>=0.1.8 +iso8601>=0.1.9 kombu>=2.4.8 lxml>=2.3 -oslo.config>=1.2.0 -oslo.db>=0.3.0 -pecan>=0.2.0 +oslo.config>=1.4.0.0a3 +oslo.db>=0.4.0 # Apache-2.0 +pecan>=0.5.0 posix_ipc -python-heatclient>=0.2.3 -python-keystoneclient>=0.4.1 +python-heatclient>=0.2.9 +python-keystoneclient>=0.10.0 PyYAML>=3.1.0 -six>=1.4.1 +six>=1.7.0 SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99 -sqlalchemy-migrate>=0.8.2 -WebOb>=1.2.3,<1.3 -WSME>=0.5b6 +sqlalchemy-migrate>=0.9.1,!=0.9.2 +WebOb>=1.2.3 +WSME>=0.6 diff --git a/setup.py b/setup.py index c0a24eab..73637574 100644 --- a/setup.py +++ b/setup.py @@ -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 eac435a0..b560344a 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,6 @@ +# 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 already pins down pep8, pyflakes and flake8 hacking>=0.9.2,<0.10 @@ -5,11 +8,11 @@ coverage>=3.6 discover fixtures>=0.3.14 mock>=1.0 -oslotest +oslotest>=1.1.0.0a2 # Doc requirements -sphinx>=1.1.2,<1.2 -sphinxcontrib-pecanwsme>=0.5 +sphinx>=1.1.2,!=1.2.0,<1.3 +sphinxcontrib-pecanwsme>=0.8 stevedore>=0.14 -testrepository>=0.0.17 -testtools>=0.9.32 +testrepository>=0.0.18 +testtools>=0.9.34 unittest2