Update from global requirements

Change-Id: I394fb4daa6b50cf2dec30ace6039e378b5b6e31a
This commit is contained in:
Max Lobur 2016-02-29 19:23:27 +02:00
parent ddaa32235b
commit baa8eff128
3 changed files with 44 additions and 29 deletions

View File

@ -1,13 +1,16 @@
Babel>=1.3 # The order of packages is significant, because pip processes them in the order
eventlet>=0.13.0 # of appearance. Changing the order has an impact on the overall integration
iso8601>=0.1.9 # process, which may cause wedges in the gate later.
jsonschema>=2.3.0 Babel>=1.3 # BSD
oslo.config>=1.6.0 eventlet!=0.18.3,>=0.18.2 # MIT
oslo.serialization>=1.4.0,<2.0 iso8601>=0.1.9 # MIT
six>=1.5.2 jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
pbr>=0.7.0 oslo.config>=3.7.0 # Apache-2.0
Jinja2 oslo.serialization>=1.10.0 # Apache-2.0
stevedore>=0.15 six>=1.9.0 # MIT
requests>=1.2.3 pbr>=1.6 # Apache-2.0
urllib3>=1.7 Jinja2>=2.8 # BSD License (3 clause)
PyYAML==3.10 stevedore>=1.5.0 # Apache-2.0
requests!=2.9.0,>=2.8.1 # Apache-2.0
urllib3>=1.8.3 # MIT
PyYAML>=3.1.0 # MIT

View File

@ -1,20 +1,29 @@
# Copyright 2014 Mirantis, Inc. # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # Licensed under the Apache License, Version 2.0 (the "License");
# not use this file except in compliance with the License. You may obtain # you may not use this file except in compliance with the License.
# a copy of the License at # 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 # Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # distributed under the License is distributed on an "AS IS" BASIS,
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# License for the specific language governing permissions and limitations # implied.
# under the License. # 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 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>=1.8'],
pbr=True) pbr=True)

View File

@ -1,10 +1,13 @@
hacking>=0.8.0,<0.9 # The order of packages is significant, because pip processes them in the order
mock==1.0.1 # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking<0.9,>=0.8.0
mock>=1.2 # BSD
requests-mock>=0.7.0 # Apache-2.0
unittest2 # BSD
pytest>=2.7.2 pytest>=2.7.2
pytest-cov>=1.8.1 pytest-cov>=1.8.1
requests-mock>=0.6
unittest2==1.1.0
# this is required for the docs build jobs # this is required for the docs build jobs
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0