diff options
| -rw-r--r-- | requirements.txt | 11 | ||||
| -rw-r--r-- | setup.py | 30 | ||||
| -rw-r--r-- | test-requirements.txt | 20 | ||||
| -rw-r--r-- | tox.ini | 2 |
4 files changed, 40 insertions, 23 deletions
diff --git a/requirements.txt b/requirements.txt index e5ffa4b1..4f19904e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,8 @@ -six>=1.5.2 -PyYAML +# 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. +six>=1.9.0 # MIT +PyYAML>=3.10.0 # MIT +pbr>=1.8 # Apache-2.0 +stevedore>=1.17.1 # Apache-2.0 python-jenkins>=0.4.8 -pbr>=1.0.0,<2.0 -stevedore>=1.8.0 @@ -1,19 +1,29 @@ -# Copyright 2012 Hewlett-Packard Development Company, L.P. +# 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. You may obtain -# a copy of the License at +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# 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'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index bbaa4bfa..af771603 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,10 +1,14 @@ -hacking>=0.5.6,<=10.1 -coverage>=3.6 -fixtures -python-subunit +# 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.13,>=0.12.0 # Apache-2.0 + +coverage>=4.0 # Apache-2.0 +fixtures>=3.0.0 # Apache-2.0/BSD +python-subunit>=0.0.18 # Apache-2.0/BSD sphinx>=1.3.1,<1.5.0 -testscenarios -testtools -testrepository +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT +testrepository>=0.0.18 # Apache-2.0/BSD +mock>=2.0 # BSD sphinxcontrib-programoutput -mock @@ -50,6 +50,6 @@ commands = {posargs} [flake8] # These are ignored intentionally in openstack-infra projects; please # don't submit patches that solely correct them or enable them. -ignore = E125,H +ignore = E125,E128,H show-source = True exclude = .virtualenv,.venv,.tox,dist,doc,build,*.egg,.test |