Skip to content

Commit

Permalink
Resolve pytest pluggy version conflict (#1457)
Browse files Browse the repository at this point in the history
  • Loading branch information
caboteria authored and sethmlarson committed Oct 17, 2018
1 parent b548abc commit cd7cfa6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion dev-requirements.txt
Expand Up @@ -7,7 +7,8 @@ tornado==5.0.2
PySocks==1.6.8
pkginfo==1.4.2
pytest-timeout==1.3.1
pytest==3.6.4
pytest==3.8.2
# https://github.com/GoogleCloudPlatform/python-repo-tools/issues/23
pylint<2.0;python_version<="2.7"
gcp-devrel-py-tools==0.0.15
pluggy==0.8.0

0 comments on commit cd7cfa6

Please sign in to comment.