Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-enable tests against latest pytest #421

Merged
merged 2 commits into from
Dec 13, 2020
Merged

Re-enable tests against latest pytest #421

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
504cbf1
Re-enable tests against latest pytest
BeyondEvil Dec 13, 2020
9e077ef
Merge branch 'master' into reenable-devel
gnikonorov Dec 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ deps =
{[testenv]deps}
ansi2html @ git+https://github.com/pycontribs/ansi2html.git
pytest-rerunfailures @ git+https://github.com/pytest-dev/pytest-rerunfailures.git
# Temporary disable pytest git install due to
# https://github.com/pytest-dev/pytest-rerunfailures/issues/134
# pytest @ git+https://github.com/pytest-dev/pytest.git
pytest @ git+https://github.com/pytest-dev/pytest.git

[testenv:devel-cov]
description = Tests with unreleased deps and coverage
Expand Down