Updated from global requirements

Change-Id: Ic1726f962811f4b348050abed2322a5cc48befca
This commit is contained in:
OpenStack Proposal Bot 2016-09-13 09:35:49 +00:00
parent 3fce7f5c86
commit ddd7867370
3 changed files with 23 additions and 13 deletions

View File

@ -1 +1,4 @@
Django>=1.8,<1.9 # 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.
Django<1.9,>=1.8 # BSD

View File

@ -1,6 +1,4 @@
#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
# (c) Copyright 2014,2015 Hewlett-Packard Development Company, L.P.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -10,13 +8,22 @@
# #
# 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, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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,7 +1,7 @@
# The order of packages is significant, because pip processes them in the order # 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 # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
hacking>=0.11.0,<0.12 # Apache-2.0 hacking<0.12,>=0.11.0 # Apache-2.0
coverage>=3.6 # Apache-2.0 coverage>=3.6 # Apache-2.0
mock>=2.0 # BSD mock>=2.0 # BSD
@ -12,15 +12,15 @@ pylint==1.4.5 # GPLv2
testrepository>=0.0.18 # Apache-2.0/BSD testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=1.4.0 # MIT testtools>=1.4.0 # MIT
unittest2 # BSD unittest2 # BSD
sphinx>=1.2.1,!=1.3b1,<1.3 # BSD sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
oslosphinx>=2.5.0,!=3.4.0 # Apache-2.0 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
nose # LGPL nose # LGPL
nosehtmloutput>=0.0.3 # Apache-2.0 nosehtmloutput>=0.0.3 # Apache-2.0
openstack.nose_plugin>=0.7 # Apache-2.0 openstack.nose-plugin>=0.7 # Apache-2.0
django-nose>=1.4.4 # BSD django-nose>=1.4.4 # BSD
nosexcover # BSD nosexcover # BSD
# Horizon requirements # Horizon requirements
Django<1.9,>=1.8 # BSD Django<1.9,>=1.8 # BSD
django-compressor>=2.0 # MIT django-compressor>=2.0 # MIT
django_openstack_auth>=2.4.0 # Apache-2.0 django-openstack-auth>=2.4.0 # Apache-2.0