diff options
author | Jeff Forcier <jeff@bitprophet.org> | 2019-06-14 14:34:07 -0400 |
---|---|---|
committer | Jeff Forcier <jeff@bitprophet.org> | 2019-06-14 14:34:07 -0400 |
commit | ff799bc51b985ac95f76ea5569327a716ffaedc0 (patch) | |
tree | 527fcf080ff9428305893c033871bb8537119d92 /dev-requirements.txt | |
parent | 03cf3215670bd4467d1296173c4c184a4be089ab (diff) | |
parent | f19d8ed2528dfc7bcd96f00fd9dde4199c5ac864 (diff) |
Merge branch '2.3' into 2.4
Diffstat (limited to 'dev-requirements.txt')
-rw-r--r-- | dev-requirements.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt index 4c118991..d163df10 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,8 +2,8 @@ invoke>=1.0,<2.0 invocations>=1.2.0,<2.0 # NOTE: pytest-relaxed currently only works with pytest >=3, <3.3 -pytest>=3.2,<3.3 -pytest-relaxed==1.1.4 +pytest==4.6.3 +pytest-relaxed==1.1.5 # pytest-xdist for test dir watching and the inv guard task pytest-xdist>=1.22,<1.25.0 mock==2.0.0 |