Skip to content

Commit ef633ba

Browse files
committed
FIX: pytest-html v4.0.0 causes pytest run to fail
* UPDATE: Some dependencies, too.
1 parent 44f95e4 commit ef633ba

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

py.requirements/basic.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# ============================================================================
88

99
click >= 6.6
10-
six >= 1.12
10+
six >= 1.15
1111

1212
# -- USE BACKPORT: For Python2 and some Python3
1313
# IMPROVED: configparser from Python 3.5

py.requirements/develop.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ bump2version >= 0.5.6
2323
twine
2424

2525
# -- TEST/DEVELOP SUPPORT:
26-
tox >= 1.8
26+
tox >= 1.8,<4.0 # HINT: tox >= 4.0 changes/breaks some things.
2727
coverage>=4.2
2828
-r testing.txt
2929

py.requirements/testing.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
# -- TEST SUPPORT:
1111
pytest < 5.0; python_version < '3.0' # >= 4.2
1212
pytest >= 5.0; python_version >= '3.0'
13-
pytest-html >= 1.19.0
13+
14+
pytest-html >= 1.19.0,<2.0; python_version < '3.0'
15+
pytest-html >= 2.0,<4.0; python_version >= '3.0'
1416

1517
# -- USE: click.testing
1618
click >= 6.6

setup.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,14 @@ def make_long_description(marker=None, intro=None):
115115
python_requires=">=2.7, !=3.0.*, !=3.1.*",
116116
install_requires=[
117117
"click >= 6.6",
118-
"six >= 1.10",
118+
"six >= 1.15",
119119
"configparser >= 3.5.0; python_version < '3.5'",
120120
],
121121
tests_require=[
122122
"pytest < 5.0; python_version < '3.0'", # >= 4.2
123123
"pytest >= 5.0; python_version >= '3.0'",
124-
"pytest-html >= 1.19.0",
124+
"pytest-html >= 1.19.0,<2.0; python_version < '3.0'",
125+
"pytest-html >= 2.0,<4.0; python_version >= '3.0'",
125126
],
126127
# extras_require={
127128
# # -- SUPPORT-WHEELS: Extra packages for Python2.6 and ...

0 commit comments

Comments
 (0)