openstack/astara-horizon
Code Issues Proposed changes

Update from global requirements

Browse Source 
Change-Id: Ia7bad85e9a78b4ed23de608dbaed4c90b9f606f3
This commit is contained in:
Adam Gandelman 2015-09-08 12:08:29 -07:00
parent a9bc1cb9a2
commit 9f0bd46221
2 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
setup.py
View File

@ -1,20 +1,29 @@
# Copyright 2015 Akanda, 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.3'],
pbr=True) pbr=True)

23
test-requirements.txt
View File

@ -1,12 +1,15 @@
# 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.
unittest2 unittest2
nose nose
coverage coverage>=3.6
mock>=0.8.0 mock>=1.2
pep8 pep8==1.5.7
eventlet==0.12.1 eventlet>=0.17.4
iso8601 iso8601>=0.1.9
python-novaclient python-novaclient>=2.28.1
WebOb==1.2.3 WebOb>=1.2.3
mox==0.5.3 mox>=0.5.3
testtools testtools>=1.4.0
fixtures fixtures>=1.3.1