Updated from global requirements
Change-Id: I2e2bd3a38458e1307bcc0410da74dc76c0a5987a
This commit is contained in:
parent
eb47b55dbd
commit
1f2eef510f
|
@ -212,7 +212,7 @@ def get_file_size(file_obj):
|
|||
size = file_obj.tell()
|
||||
file_obj.seek(curr)
|
||||
return size
|
||||
except IOError, e:
|
||||
except IOError as e:
|
||||
if e.errno == errno.ESPIPE:
|
||||
# Illegal seek. This means the file object
|
||||
# is a pipe (e.g the user is trying
|
||||
|
|
|
@ -112,7 +112,7 @@ class Controller(object):
|
|||
for (key, value) in kwargs.items():
|
||||
try:
|
||||
setattr(image, key, value)
|
||||
except warlock.InvalidOperation, e:
|
||||
except warlock.InvalidOperation as e:
|
||||
raise TypeError(utils.exception_to_str(e))
|
||||
|
||||
resp, body = self.http_client.json_request('POST', url, body=image)
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
d2to1>=0.2.10,<0.3
|
||||
pbr>=0.5,<0.6
|
||||
pbr>=0.5.21,<1.0
|
||||
|
||||
argparse
|
||||
prettytable>=0.6,<0.8
|
||||
python-keystoneclient>=0.2.1
|
||||
PrettyTable>=0.6,<0.8
|
||||
python-keystoneclient>=0.3.0
|
||||
pyOpenSSL
|
||||
warlock>=0.7.0,<2
|
||||
warlock>=1.0.1,<2
|
||||
|
|
5
setup.py
5
setup.py
|
@ -14,8 +14,9 @@
|
|||
# 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
|
||||
|
||||
setuptools.setup(
|
||||
setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
|
||||
d2to1=True)
|
||||
setup_requires=['pbr>=0.5.21,<1.0'],
|
||||
pbr=True)
|
||||
|
|
|
@ -1,14 +1,9 @@
|
|||
# Install bounded pep8/pyflakes first, then let flake8 install
|
||||
pep8==1.4.5
|
||||
pyflakes==0.7.2
|
||||
flake8==2.0
|
||||
hacking>=0.5.3,<0.6
|
||||
hacking>=0.5.6,<0.7
|
||||
|
||||
coverage
|
||||
coverage>=3.6
|
||||
discover
|
||||
mox
|
||||
mox>=0.5.3
|
||||
mock>=0.8.0
|
||||
setuptools-git>=0.4
|
||||
sphinx>=1.1.2
|
||||
testrepository>=0.0.13
|
||||
testtools>=0.9.22
|
||||
testrepository>=0.0.17
|
||||
testtools>=0.9.32
|
||||
|
|
4
tox.ini
4
tox.ini
|
@ -26,10 +26,12 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
|
|||
downloadcache = ~/cache/pip
|
||||
|
||||
[flake8]
|
||||
# H233 Python 3.x incompatible use of print operator
|
||||
# H302 import only modules
|
||||
# H303 no wildcard import
|
||||
# H306 imports not in alphabetical orde
|
||||
# H404 multi line docstring should start with a summary
|
||||
ignore = F403,F841,F812,F821,H302,H303,H306,H404
|
||||
# H501 Do not use locals() for string formatting
|
||||
ignore = F403,F841,F812,F821,H233,H302,H303,H306,H404,H501
|
||||
show-source = True
|
||||
exclude = .venv,.tox,dist,doc,*egg,build
|
||||
|
|
Loading…
Reference in New Issue