From cd7cfa613b2678e700597d098ce9bbdc934863e6 Mon Sep 17 00:00:00 2001
From: toby cabot <toby@caboteria.org>
Date: Wed, 17 Oct 2018 08:35:59 -0400
Subject: [PATCH] Resolve pytest pluggy version conflict (#1457)

---
 dev-requirements.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index abbe781a09..df3ed61097 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -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