Merge "Fix lower-constraints job"

This commit is contained in:
Zuul 2018-04-23 09:36:46 +00:00 committed by Gerrit Code Review
commit 6b99ff9253
4 changed files with 15 additions and 30 deletions

View File

@ -7,6 +7,7 @@ debtcollector==1.2.0
extras==1.0.0
fixtures==3.0.0
flake8==2.5.5
funcsigs==1.0.0
future==0.16.0
gevent==1.2.2
gitdb==0.6.4
@ -14,13 +15,15 @@ GitPython==1.0.1
greenlet==0.4.10
hacking==0.12.0
iso8601==0.1.11
Jinja2==2.10
jira==1.0.3
kazoo==2.2
keystoneauth1==3.4.0
linecache2==1.0.0
mccabe==0.2.1
mock==2.0.0
monasca-common==2.7.0
monasca-statsd==1.1.0
monasca-statsd==1.4.0
monotonic==0.6
mox3==0.20.0
msgpack-python==0.4.0

View File

@ -3,10 +3,10 @@
# process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0
debtcollector>=1.2.0 # Apache-2.0
monasca-statsd>=1.1.0 # Apache-2.0
monasca-statsd>=1.4.0 # Apache-2.0
requests>=2.14.2 # Apache-2.0
PyYAML>=3.10 # MIT
PyYAML>=3.12 # MIT
six>=1.10.0 # MIT
monasca-common>=1.4.0 # Apache-2.0
oslo.config>=5.1.0 # Apache-2.0
monasca-common>=2.7.0 # Apache-2.0
oslo.config>=5.2.0 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0

View File

@ -36,4 +36,4 @@ universal = 1
[extras]
jira_plugin =
jira
Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)
Jinja2>=2.10 # BSD License (3 clause)

30
tox.ini
View File

@ -23,33 +23,13 @@ deps =
commands =
find . -type f -name "*.pyc" -delete
rm -Rf .testrepository/times.dbm
[testenv:py27]
description = Runs unit test using Python2.7
basepython = python2.7
commands =
{[testenv]commands}
ostestr {posargs}
[testenv:py35]
description = Runs unit test using Python3.5
basepython = python3.5
commands =
{[testenv]commands}
ostestr {posargs}
[testenv:pypy]
description = Runs unit test using pypy
basepython = pypy
commands =
{[testenv]commands}
ostestr {posargs}
ostestr {posargs}
[testenv:cover]
commands =
{[testenv]commands}
coverage erase
python setup.py test --coverage --testr-args='{posargs}' --coverage-package-name=monasca_notification
python setup.py test --coverage --testr-args='{posargs}' \
--coverage-package-name=monasca_notification
coverage report
[testenv:debug]
@ -75,7 +55,8 @@ commands =
[testenv:genconfig]
description = Generates an example of monasca-notification configuration file
commands = oslo-config-generator --config-file={toxinidir}/config-generator/notification.conf
commands = oslo-config-generator \
--config-file={toxinidir}/config-generator/notification.conf
[flake8]
max-line-length = 100
@ -96,3 +77,4 @@ deps =
-c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
.[jira_plugin]