Skip to content

Commit 6174992

Browse files
author
Sylvain MARIE
committed
Fixed CI jobs
1 parent 0f6590f commit 6174992

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

noxfile.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
(PY38, "pytest7.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<8"}},
3838
(PY38, "pytest-latest"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": ""}},
3939
# python 2.7
40-
(PY27, "pytest3.x"): {"coverage": False, "pkg_specs": {"pip": ">10", "pytest": "<4", "pytest-asyncio": DONT_INSTALL}},
41-
(PY27, "pytest4.x"): {"coverage": False, "pkg_specs": {"pip": ">10", "pytest": "<5", "pytest-asyncio": DONT_INSTALL}},
40+
(PY27, "pytest3.x"): {"coverage": False, "pkg_specs": {"pip": ">10", "pytest": "<4", "pytest-harvest": "<1.10.5", "pytest-asyncio": DONT_INSTALL}},
41+
(PY27, "pytest4.x"): {"coverage": False, "pkg_specs": {"pip": ">10", "pytest": "<5", "pytest-harvest": "<1.10.5", "pytest-asyncio": DONT_INSTALL}},
4242
# python 3.5
43-
(PY35, "pytest3.x"): {"coverage": False, "pkg_specs": {"pip": ">10", "pytest": "<4", "pytest-asyncio": DONT_INSTALL}},
44-
(PY35, "pytest4.x"): {"coverage": False, "pkg_specs": {"pip": ">10", "pytest": "<5", "pytest-asyncio": DONT_INSTALL}},
45-
(PY35, "pytest5.x"): {"coverage": False, "pkg_specs": {"pip": ">10", "pytest": "<6"}},
43+
(PY35, "pytest3.x"): {"coverage": False, "pkg_specs": {"pip": ">10", "pytest": "<4", "pytest-harvest": "<1.10.5", "pytest-asyncio": DONT_INSTALL}},
44+
(PY35, "pytest4.x"): {"coverage": False, "pkg_specs": {"pip": ">10", "pytest": "<5", "pytest-harvest": "<1.10.5", "pytest-asyncio": DONT_INSTALL}},
45+
(PY35, "pytest5.x"): {"coverage": False, "pkg_specs": {"pip": ">10", "pytest": "<6", "pytest-harvest": "<1.10.5"}},
4646
# python 3.6
4747
(PY36, "pytest3.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<4"}},
4848
(PY36, "pytest4.x"): {"coverage": False, "pkg_specs": {"pip": ">19", "pytest": "<5"}},

src/pytest_cases/common_pytest_marks.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
PYTEST7_OR_GREATER = PYTEST_VERSION >= Version('7.0.0')
4545
PYTEST71_OR_GREATER = PYTEST_VERSION >= Version('7.1.0')
4646
PYTEST8_OR_GREATER = PYTEST_VERSION >= Version('8.0.0')
47+
PYTEST811 = PYTEST_VERSION == Version('8.1.1')
4748

4849

4950
def get_param_argnames_as_list(argnames):

tests/pytest_extension/order/session_optim/test_reorder_default_normal.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# License: 3-clause BSD, <https://github.com/smarie/python-pytest-cases/blob/master/LICENSE>
55
import pytest
66

7-
from pytest_cases.common_pytest_marks import PYTEST3_OR_GREATER, PYTEST361_36X
7+
from pytest_cases.common_pytest_marks import PYTEST3_OR_GREATER, PYTEST361_36X, PYTEST811
88

99

1010
def test_config(request):
@@ -30,7 +30,7 @@ def test2(reprovision):
3030
pass
3131

3232

33-
@pytest.mark.skipif((not PYTEST3_OR_GREATER) or PYTEST361_36X,
33+
@pytest.mark.skipif((not PYTEST3_OR_GREATER) or PYTEST361_36X or PYTEST811,
3434
reason="This 'optimal order' was changed in some versions of pytest")
3535
def test_synthesis(module_results_dct):
3636
assert list(module_results_dct) == ['test_config',

0 commit comments

Comments
 (0)