Skip to content

Commit cd7cfa6

Browse files
caboteriasethmlarson
authored andcommitted
Resolve pytest pluggy version conflict (#1457)
1 parent b548abc commit cd7cfa6

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

dev-requirements.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ tornado==5.0.2
77
PySocks==1.6.8
88
pkginfo==1.4.2
99
pytest-timeout==1.3.1
10-
pytest==3.6.4
10+
pytest==3.8.2
1111
# https://github.com/GoogleCloudPlatform/python-repo-tools/issues/23
1212
pylint<2.0;python_version<="2.7"
1313
gcp-devrel-py-tools==0.0.15
14+
pluggy==0.8.0

0 commit comments

Comments
 (0)