openstack
/
astara
Code Issues Proposed changes

Cleanup requirements 

Moves eventlet + six to where they should be and runs requirements'
update.py through the repo, setting correct liberty constraints.

Change-Id: Ieb24cdf1a2e3d895b33a588012a0153cfe9d93a8
This commit is contained in:
Adam Gandelman 2015-06-29 14:01:39 -07:00
parent a227ab593b
commit b08e39b4af
3 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
requirements.txt
View File

@ -1,14 +1,18 @@
netaddr # The order of packages is significant, because pip processes them in the order
httplib2 # of appearance. Changing the order has an impact on the overall integration
python-neutronclient>=2.3.0,<3 # process, which may cause wedges in the gate later.
oslo.config>=1.2.0 eventlet>=0.17.4
oslo.context>=0.2.0,<0.3.0 netaddr>=0.7.12
oslo.i18n>=1.5.0 httplib2>=0.7.5
oslo.log>=1.2.0 python-neutronclient<3,>=2.3.11
oslo.messaging>=1.8.0 oslo.config>=1.11.0 # Apache-2.0
oslo.serialization>=1.4.0,<1.5.0 oslo.context>=0.2.0 # Apache-2.0
oslo.utils>=1.4.0,<1.5.0 oslo.i18n>=1.5.0 # Apache-2.0
kombu>=2.4.8 oslo.log>=1.2.0 # Apache-2.0
WebOb>=1.2.3,<1.3 oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
python-novaclient>=2.15.0 oslo.serialization>=1.4.0 # Apache-2.0
cliff>=1.4.3 oslo.utils>=1.6.0 # Apache-2.0
WebOb>=1.2.3
python-novaclient>=2.22.0
cliff>=1.13.0 # Apache-2.0
six>=1.9.0

32
setup.py
View File

@ -1,23 +1,29 @@
# Copyright 2014 DreamHost, LLC # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
# Copyright 2015 Akanda, Inc
# #
# Author: DreamHost, LLC # 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 # http://www.apache.org/licenses/LICENSE-2.0
# 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
# #
# 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'],
pbr=True) pbr=True)

18
test-requirements.txt
View File

@ -1,11 +1,13 @@
# 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.0
pep8 pep8==1.5.7
eventlet==0.12.1 iso8601>=0.1.9
iso8601 mox>=0.5.3
mox==0.5.3 testtools>=1.4.0
testtools fixtures>=0.3.14
fixtures
six>=1.9.0 six>=1.9.0