summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-04-23 09:36:46 +0000
committerGerrit Code Review <review@openstack.org>2018-04-23 09:36:46 +0000
commit6b99ff9253cb82b22ac661dff6928a37b36c0517 (patch)
tree579d04defc9f5e674c7b8e44509b00208bdfaa74
parentd396753a839c1317a59fb2867dc2188fc88cf95a (diff)
parent9a6edb40a5edebfb8012c8457fae594a298f69bf (diff)
Merge "Fix lower-constraints job"
-rw-r--r--lower-constraints.txt5
-rw-r--r--requirements.txt8
-rw-r--r--setup.cfg2
-rw-r--r--tox.ini30
4 files changed, 15 insertions, 30 deletions
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 68f5ecf..2065e59 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -7,6 +7,7 @@ debtcollector==1.2.0
7extras==1.0.0 7extras==1.0.0
8fixtures==3.0.0 8fixtures==3.0.0
9flake8==2.5.5 9flake8==2.5.5
10funcsigs==1.0.0
10future==0.16.0 11future==0.16.0
11gevent==1.2.2 12gevent==1.2.2
12gitdb==0.6.4 13gitdb==0.6.4
@@ -14,13 +15,15 @@ GitPython==1.0.1
14greenlet==0.4.10 15greenlet==0.4.10
15hacking==0.12.0 16hacking==0.12.0
16iso8601==0.1.11 17iso8601==0.1.11
18Jinja2==2.10
19jira==1.0.3
17kazoo==2.2 20kazoo==2.2
18keystoneauth1==3.4.0 21keystoneauth1==3.4.0
19linecache2==1.0.0 22linecache2==1.0.0
20mccabe==0.2.1 23mccabe==0.2.1
21mock==2.0.0 24mock==2.0.0
22monasca-common==2.7.0 25monasca-common==2.7.0
23monasca-statsd==1.1.0 26monasca-statsd==1.4.0
24monotonic==0.6 27monotonic==0.6
25mox3==0.20.0 28mox3==0.20.0
26msgpack-python==0.4.0 29msgpack-python==0.4.0
diff --git a/requirements.txt b/requirements.txt
index 13ecd5e..0fc38a7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,10 +3,10 @@
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4pbr!=2.1.0,>=2.0.0 # Apache-2.0 4pbr!=2.1.0,>=2.0.0 # Apache-2.0
5debtcollector>=1.2.0 # Apache-2.0 5debtcollector>=1.2.0 # Apache-2.0
6monasca-statsd>=1.1.0 # Apache-2.0 6monasca-statsd>=1.4.0 # Apache-2.0
7requests>=2.14.2 # Apache-2.0 7requests>=2.14.2 # Apache-2.0
8PyYAML>=3.10 # MIT 8PyYAML>=3.12 # MIT
9six>=1.10.0 # MIT 9six>=1.10.0 # MIT
10monasca-common>=1.4.0 # Apache-2.0 10monasca-common>=2.7.0 # Apache-2.0
11oslo.config>=5.1.0 # Apache-2.0 11oslo.config>=5.2.0 # Apache-2.0
12oslo.log>=3.36.0 # Apache-2.0 12oslo.log>=3.36.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index c49688f..f1fcccd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -36,4 +36,4 @@ universal = 1
36[extras] 36[extras]
37jira_plugin = 37jira_plugin =
38 jira 38 jira
39 Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause) 39 Jinja2>=2.10 # BSD License (3 clause)
diff --git a/tox.ini b/tox.ini
index 80792df..ec318a9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,33 +23,13 @@ deps =
23commands = 23commands =
24 find . -type f -name "*.pyc" -delete 24 find . -type f -name "*.pyc" -delete
25 rm -Rf .testrepository/times.dbm 25 rm -Rf .testrepository/times.dbm
26 26 ostestr {posargs}
27[testenv:py27]
28description = Runs unit test using Python2.7
29basepython = python2.7
30commands =
31 {[testenv]commands}
32 ostestr {posargs}
33
34[testenv:py35]
35description = Runs unit test using Python3.5
36basepython = python3.5
37commands =
38 {[testenv]commands}
39 ostestr {posargs}
40
41[testenv:pypy]
42description = Runs unit test using pypy
43basepython = pypy
44commands =
45 {[testenv]commands}
46 ostestr {posargs}
47 27
48[testenv:cover] 28[testenv:cover]
49commands = 29commands =
50 {[testenv]commands}
51 coverage erase 30 coverage erase
52 python setup.py test --coverage --testr-args='{posargs}' --coverage-package-name=monasca_notification 31 python setup.py test --coverage --testr-args='{posargs}' \
32 --coverage-package-name=monasca_notification
53 coverage report 33 coverage report
54 34
55[testenv:debug] 35[testenv:debug]
@@ -75,7 +55,8 @@ commands =
75 55
76[testenv:genconfig] 56[testenv:genconfig]
77description = Generates an example of monasca-notification configuration file 57description = Generates an example of monasca-notification configuration file
78commands = oslo-config-generator --config-file={toxinidir}/config-generator/notification.conf 58commands = oslo-config-generator \
59 --config-file={toxinidir}/config-generator/notification.conf
79 60
80[flake8] 61[flake8]
81max-line-length = 100 62max-line-length = 100
@@ -96,3 +77,4 @@ deps =
96 -c{toxinidir}/lower-constraints.txt 77 -c{toxinidir}/lower-constraints.txt
97 -r{toxinidir}/test-requirements.txt 78 -r{toxinidir}/test-requirements.txt
98 -r{toxinidir}/requirements.txt 79 -r{toxinidir}/requirements.txt
80 .[jira_plugin]