Skip to content

fix: Use different versions of pytest for python 2 and python3 #2558

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

Merged
leahecole merged 5 commits into from
Nov 20, 2019
Merged

fix: Use different versions of pytest for python 2 and python3 #2558

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b89234
fix: Use different versions of pytest for python 2 and python3
crwilcox Nov 19, 2019
30ffd9e
fix: delete extra pytest dep
crwilcox Nov 19, 2019
5602fe4
fix: update pytest dependencies in requirements.txt
crwilcox Nov 20, 2019
275e19d
Merge branch 'master' into pytest-pins
kurtisvg Nov 20, 2019
cc8df54
Merge branch 'master' into pytest-pins
leahecole Nov 20, 2019
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
Next Next commit
fix: Use different versions of pytest for python 2 and python3
  • Loading branch information
@crwilcox
crwilcox authored Nov 19, 2019
commit 9b89234199a7ea0360e709e3a9705d58966991fe
2 changes: 2 additions & 0 deletions testing/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ mock==3.0.5
mysql-python==1.2.5; python_version < "3.0"
PyCrypto==2.6.1
pytest-cov==2.8.1
pytest==5.3.0; python_version > "3.0"
pytest==4.6.6; python_version < "3.0"
pytest==5.2.1
pyyaml==5.1.2
responses==0.10.6
Expand Down