Sync with global requirements

Change-Id: I8333e17d8edaa5853ac47f9d53de8c44d1c5d5cb
This commit is contained in:
Monty Taylor 2013-08-05 17:50:29 -03:00
parent 0c0f093744
commit ec5861644c
4 changed files with 18 additions and 21 deletions

View File

@ -1,8 +1,7 @@
d2to1>=0.2.10,<0.3 pbr>=0.5.16,<0.6
pbr>=0.5,<0.6
argparse argparse
iso8601>=0.1.4 iso8601>=0.1.4
prettytable>=0.6,<0.8 PrettyTable>=0.6,<0.8
requests>=0.8 requests>=1.1,<1.2.3
simplejson simplejson>=2.0.9
six six

View File

@ -1,24 +1,22 @@
# 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.
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools import setuptools
setuptools.setup( setuptools.setup(
setup_requires=[ setup_requires=['pbr>=0.5.20'],
'd2to1>=0.2.10,<0.3', pbr=True)
'pbr>=0.5,<0.6'
],
d2to1=True
)

View File

@ -2,13 +2,13 @@
pep8==1.4.5 pep8==1.4.5
pyflakes==0.7.2 pyflakes==0.7.2
flake8==2.0 flake8==2.0
hacking>=0.5.3,<0.6 hacking>=0.5.6,<0.7
coverage coverage>=3.6
discover discover
fixtures>=0.3.12 fixtures>=0.3.12
keyring keyring
mock mock>=0.8.0
sphinx>=1.1.2 sphinx>=1.1.2
testrepository>=0.0.13 testrepository>=0.0.17
testtools>=0.9.26 testtools>=0.9.32

View File

@ -24,6 +24,6 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
downloadcache = ~/cache/pip downloadcache = ~/cache/pip
[flake8] [flake8]
ignore = E12,E711,E721,E712,F841,F811,F821,H302,H306,H403,H404 ignore = E12,E711,E721,E712,F841,F811,F821,H102,H302,H306,H403,H404,H501
show-source = True show-source = True
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build