Skip to content

Commit 4173519

Browse files
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 changed

3 files changed

+11
-11
lines changed

dev-requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,11 @@ readme-renderer>=23.0; python_version >= '3.5'
133133
pytz>=2016.10; python_version <= '3.9'
134134
pytz>=2019.1; python_version >= '3.10'
135135

136-
# colorama (used by TBD)
136+
# colorama (used by tox, pytest)
137137
# colorama 0.4.0 removed support for Python 3.4
138+
# tox 3.21.0 depends on colorama>=0.4.1 for platform_system == "Windows"
138139
colorama>=0.3.9,<0.4.0; python_version <= '3.4'
139-
colorama>=0.4.0; python_version >= '3.5'
140+
colorama>=0.4.1; python_version >= '3.5'
140141

141142

142143
# Additional indirect dependencies are not specified in this file:

minimum-constraints.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,8 @@ virtualenv==20.1.0; python_version >= '3.5'
121121
# packaging (used by pytest)
122122
packaging==17.0
123123

124-
# pluggy (used by pytest)
125-
# Pluggy 0.12.0 has a bug causing pytest plugins to fail loading on py38
126-
pluggy==0.7.1; python_version >= '2.7' and python_version <= '3.6'
127-
pluggy==0.13.0; python_version >= '3.7'
124+
# pluggy (used by pytest, tox)
125+
pluggy==0.13.1
128126

129127
# six (used by virtualenv, tox, probably others)
130128
# virtualenv 20.0 requires six>=1.12.0 on py>=3.8
@@ -212,10 +210,10 @@ readme-renderer==23.0
212210
pytz==2016.10; python_version <= '3.9'
213211
pytz==2019.1; python_version >= '3.10'
214212

215-
# colorama (used by TBD)
213+
# colorama (used by tox, pytest)
216214
# colorama 0.4.0 removed support for Python 3.4
217215
colorama==0.3.9; python_version <= '3.4'
218-
colorama==0.4.0; python_version >= '3.5'
216+
colorama==0.4.1; python_version >= '3.5'
219217

220218

221219
# Other indirect dependencies (not in any requirements file):

test-requirements.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ virtualenv>=20.1.0; python_version >= '3.5'
3434
# packaging (used by pytest)
3535
packaging>=17.0
3636

37-
# pluggy (used by pytest)
37+
# pluggy (used by pytest, tox)
3838
# Pluggy 0.12.0 has a bug causing pytest plugins to fail loading on py38
39-
pluggy>=0.7.1; python_version >= '2.7' and python_version <= '3.6'
40-
pluggy>=0.13.0; python_version >= '3.7'
39+
# pytest 4.3.1 depends on pluggy>=0.7
40+
# tox 3.21.0 depends on pluggy>=0.12.0
41+
pluggy>=0.13.1
4142

4243
# six (used by virtualenv, tox, probably others)
4344
# virtualenv 20.0 requires six>=1.12.0 on py>=3.8

0 commit comments

Comments
 (0)