Merge "Align build files and requirements"
This commit is contained in:
commit
941ac61e32
|
@ -14,10 +14,10 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import itertools
|
||||
import shlex
|
||||
import subprocess
|
||||
import sys
|
||||
import itertools
|
||||
|
||||
warn_limit = 90
|
||||
crit_limit = 95
|
||||
|
@ -89,5 +89,5 @@ if not output_msg:
|
|||
output_msg = "OK - All processes open files with in limits."
|
||||
exit_code = status['OK']
|
||||
|
||||
print output_msg
|
||||
print(output_msg)
|
||||
sys.exit(exit_code)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
pbr>=0.5.21,<1.0
|
11
setup.cfg
11
setup.cfg
|
@ -4,11 +4,12 @@ version = 0.0.1
|
|||
summary = Disk image builder elements for deploying OpenStack.
|
||||
description-file =
|
||||
README.md
|
||||
author = HP Cloud Services
|
||||
author = OpenStack
|
||||
author_email = openstack-dev@lists.openstack.org
|
||||
license: Apache License (2.0)
|
||||
home-page = https://github.com/openstack/tripleo-image-elements
|
||||
license = Apache License (2.0)
|
||||
home-page = https://git.openstack.org/cgit/openstack/tripleo-image-elements
|
||||
classifier =
|
||||
Environment :: OpenStack
|
||||
Development Status :: 3 - Alpha
|
||||
License :: OSI Approved :: Apache Software License
|
||||
Operating System :: POSIX :: Linux
|
||||
|
@ -18,7 +19,3 @@ classifier =
|
|||
[files]
|
||||
data_files =
|
||||
share/tripleo-image-elements = elements/*
|
||||
|
||||
[global]
|
||||
setup-hooks =
|
||||
pbr.hooks.setup_hook
|
||||
|
|
8
setup.py
8
setup.py
|
@ -1,4 +1,5 @@
|
|||
#!/usr/bin/python
|
||||
#!/usr/bin/env python
|
||||
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
@ -13,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.10,<0.6'],
|
||||
d2to1=True)
|
||||
setup_requires=['pbr'],
|
||||
pbr=True)
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
hacking>=0.5.6,<0.8
|
|
@ -1,2 +0,0 @@
|
|||
testtools
|
||||
fixtures
|
47
tox.ini
47
tox.ini
|
@ -1,43 +1,20 @@
|
|||
[tox]
|
||||
envlist = py26,py27,pep8
|
||||
minversion = 1.6
|
||||
skipsdist = True
|
||||
envlist = pep8
|
||||
|
||||
[testenv]
|
||||
setenv = LANG=en_US.UTF-8
|
||||
LANGUAGE=en_US:en
|
||||
LC_ALL=C
|
||||
deps=
|
||||
testtools
|
||||
testrepository
|
||||
coverage
|
||||
babel
|
||||
commands=
|
||||
bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'
|
||||
bash -c 'testr run --parallel {posargs} ; RET=$? echo "Slowest Tests" ; testr slowest && exit $RET'
|
||||
|
||||
[testenv:py26]
|
||||
deps=
|
||||
testtools
|
||||
testrepository
|
||||
coverage
|
||||
babel
|
||||
discover
|
||||
argparse
|
||||
|
||||
[pep8]
|
||||
ignore = E125
|
||||
|
||||
[testenv:pep8]
|
||||
deps = pep8
|
||||
commands =
|
||||
pep8 --repeat --show-source --exclude=.venv,.tox,doc .
|
||||
usedevelop = True
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
||||
[testenv:venv]
|
||||
commands = {posargs}
|
||||
|
||||
[testenv:cover]
|
||||
setenv = PYTHON=coverage run --source tripleo_image_elements
|
||||
commands = bash -c 'if [ ! -d ./.testrepository ] ; then testr init ; fi'
|
||||
bash -c 'testr run --parallel ; RET=$? ; coverage combine ; coverage html -d ./cover $OMIT && exit $RET'
|
||||
[testenv:pep8]
|
||||
commands = flake8
|
||||
|
||||
[tox:jenkins]
|
||||
downloadcache = ~/cache/pip
|
||||
[flake8]
|
||||
ignore = E125,H803
|
||||
exclude = .venv,.tox,dist,doc,*.egg
|
||||
show-source = true
|
||||
|
|
Loading…
Reference in New Issue