Commit 4173519
committed
Fixed dependency issues from previous commit
Details:
* The increase of tox to 3.21.0 in the previous commit causes a version conflict
on Python 3.6 with minimum package levels, since pluggy 0.7.1 violates the
tox requirement of pluggy>=0.12.0. Fixed that by increasing the minimum version
of pluggy to 0.13.1 for all Python versions (for simplicity).
* The increase of tox to 3.21.0 in the previous commit causes a version conflict
on Python>=3.6 with minimum package levels just on Windows, because tox
requires colorama>=0.4.1 but the minimum is 0.4.0. Fixed that by increasing
the minimum version of colorama to 0.4.1 on Python >=3.5.
Signed-off-by: Andreas Maier <andreas.r.maier@gmx.de>1 parent 213d9be commit 4173519
File tree
3 files changed
+11
-11
lines changed3 files changed
+11
-11
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
133 | 133 | | |
134 | 134 | | |
135 | 135 | | |
136 | | - | |
| 136 | + | |
137 | 137 | | |
| 138 | + | |
138 | 139 | | |
139 | | - | |
| 140 | + | |
140 | 141 | | |
141 | 142 | | |
142 | 143 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
121 | 121 | | |
122 | 122 | | |
123 | 123 | | |
124 | | - | |
125 | | - | |
126 | | - | |
127 | | - | |
| 124 | + | |
| 125 | + | |
128 | 126 | | |
129 | 127 | | |
130 | 128 | | |
| |||
212 | 210 | | |
213 | 211 | | |
214 | 212 | | |
215 | | - | |
| 213 | + | |
216 | 214 | | |
217 | 215 | | |
218 | | - | |
| 216 | + | |
219 | 217 | | |
220 | 218 | | |
221 | 219 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | | - | |
40 | | - | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
41 | 42 | | |
42 | 43 | | |
43 | 44 | | |
| |||
0 commit comments