Merge "Remove d2to dependency"

This commit is contained in:
Jenkins 2013-10-08 04:36:33 +00:00 committed by Gerrit Code Review
commit f996a116ff
2 changed files with 9 additions and 12 deletions

View File

@ -1,12 +1,12 @@
pbr>=0.5.21,<1.0
argparse argparse
cheetah>=2.4.4 cheetah>=2.4.4
d2to1>=0.2.10,<0.3
iniparse iniparse
iso8601>=0.1.4 iso8601>=0.1.4
keyring>=1.6.1,<2.0 keyring>=1.6.1,<2.0
netifaces>=0.5 netifaces>=0.5
ordereddict ordereddict
pbr>=0.5.16,<0.6
progressbar progressbar
psutil psutil
pyyaml>=3.1.0 pyyaml>=3.1.0

View File

@ -1,24 +1,21 @@
# Copyright 2011 OpenStack Foundation #!/usr/bin/env python
# Copyright (c) 2013 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.
# You may obtain 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, # 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.
import setuptools import setuptools
setuptools.setup( setuptools.setup(
setup_requires=[ setup_requires=['pbr'],
'd2to1>=0.2.10,<0.3', pbr=True)
'pbr>=0.5,<0.6'
],
d2to1=True
)