Browse Source

Fix lower-constraints job

* update requirements from global-requirements
* move common commands to [testenv]
* bump monasca-statsd to 1.4.0 which is the first version with Python 3
  support
* add funcsigs, Jinja2 and jira to lower-constraints.txt

Depends-On: https://review.openstack.org/562151
Change-Id: I427dd136b385f8784e6d16b174dcadf3ffa555a7
Witold Bedyk 1 year ago
parent
commit
9a6edb40a5
4 changed files with 15 additions and 30 deletions
  1. 4
    1
      lower-constraints.txt
  2. 4
    4
      requirements.txt
  3. 1
    1
      setup.cfg
  4. 6
    24
      tox.ini

+ 4
- 1
lower-constraints.txt View File

@@ -7,6 +7,7 @@ debtcollector==1.2.0
7 7
 extras==1.0.0
8 8
 fixtures==3.0.0
9 9
 flake8==2.5.5
10
+funcsigs==1.0.0
10 11
 future==0.16.0
11 12
 gevent==1.2.2
12 13
 gitdb==0.6.4
@@ -14,13 +15,15 @@ GitPython==1.0.1
14 15
 greenlet==0.4.10
15 16
 hacking==0.12.0
16 17
 iso8601==0.1.11
18
+Jinja2==2.10
19
+jira==1.0.3
17 20
 kazoo==2.2
18 21
 keystoneauth1==3.4.0
19 22
 linecache2==1.0.0
20 23
 mccabe==0.2.1
21 24
 mock==2.0.0
22 25
 monasca-common==2.7.0
23
-monasca-statsd==1.1.0
26
+monasca-statsd==1.4.0
24 27
 monotonic==0.6
25 28
 mox3==0.20.0
26 29
 msgpack-python==0.4.0

+ 4
- 4
requirements.txt View File

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

+ 1
- 1
setup.cfg View File

@@ -36,4 +36,4 @@ universal = 1
36 36
 [extras]
37 37
 jira_plugin =
38 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)

+ 6
- 24
tox.ini View File

@@ -23,33 +23,13 @@ deps =
23 23
 commands =
24 24
  find . -type f -name "*.pyc" -delete
25 25
  rm -Rf .testrepository/times.dbm
26
-
27
-[testenv:py27]
28
-description = Runs unit test using Python2.7
29
-basepython = python2.7
30
-commands =
31
-  {[testenv]commands}
32
-  ostestr {posargs}
33
-
34
-[testenv:py35]
35
-description = Runs unit test using Python3.5
36
-basepython = python3.5
37
-commands =
38
-  {[testenv]commands}
39
-  ostestr {posargs}
40
-
41
-[testenv:pypy]
42
-description = Runs unit test using pypy
43
-basepython = pypy
44
-commands =
45
-  {[testenv]commands}
46
-  ostestr {posargs}
26
+ ostestr {posargs}
47 27
 
48 28
 [testenv:cover]
49 29
 commands =
50
-  {[testenv]commands}
51 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 33
   coverage report
54 34
 
55 35
 [testenv:debug]
@@ -75,7 +55,8 @@ commands =
75 55
 
76 56
 [testenv:genconfig]
77 57
 description = Generates an example of monasca-notification configuration file
78
-commands = oslo-config-generator --config-file={toxinidir}/config-generator/notification.conf
58
+commands = oslo-config-generator \
59
+  --config-file={toxinidir}/config-generator/notification.conf
79 60
 
80 61
 [flake8]
81 62
 max-line-length = 120
@@ -96,3 +77,4 @@ deps =
96 77
   -c{toxinidir}/lower-constraints.txt
97 78
   -r{toxinidir}/test-requirements.txt
98 79
   -r{toxinidir}/requirements.txt
80
+  .[jira_plugin]

Loading…
Cancel
Save