Skip to content

Commit

Permalink
Merge "tests: don't use pytest-skiptest 0.14.0"
Browse files Browse the repository at this point in the history
  • Loading branch information
xqt authored and Gerrit Code Review committed Dec 10, 2024
2 parents 1263be2 + d0412a9 commit 64f5a89
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
pytest >= 7.0.1
pytest-cov >= 3.0.0; python_version>="3.10"
pytest-cov >= 2.11.1; python_version<"3.10"
pytest-subtests >= 0.3.2, < 0.14.0; python_version<"3.11"
pytest-subtests >= 0.3.2; python_version>"3.10"
pytest-subtests != 0.14.0
pytest-attrib>=0.1.3
pytest-xvfb>=3.0.0

Expand Down
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ deps =

fasttest: pytest >= 7.0.1
fasttest: pytest-attrib>=0.1.3
fasttest: pytest-subtests >= 0.3.2, < 0.14.0; python_version < "3.11"
fasttest: pytest-subtests >= 0.3.2; python_version > "3.10"
fasttest: pytest-subtests != 0.14.0
fasttest: mock
fasttest: .[scripts]

Expand All @@ -59,7 +58,7 @@ deps =
deeptest: .[scripts]
deeptest-py312: .[wikitextparser]
deeptest-py312: pytest >= 7.0.1
deeptest-py312: pytest-subtests >= 0.3.2
deeptest-py312: pytest-subtests != 0.14.0

[testenv:typing]
basepython = python3.8
Expand Down

0 comments on commit 64f5a89

Please sign in to comment.