From 41a665af1f38938173debc5d62f41778c965b34a Mon Sep 17 00:00:00 2001 From: toby cabot Date: Tue, 16 Oct 2018 16:36:20 -0400 Subject: [PATCH 1/2] Upgrade pytest to allow it work with pluggy 0.8.0 Pluggy released a new version today but pytest 3.6.4 explicitly forbade it, so the urllib3 builds started to fail. Pytest 3.8.2 allows pluggy 0.8.0 so they will work with one another. --- dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index abbe781a09..cba2818c5d 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -7,7 +7,7 @@ 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 From 2f21ef8c50d74aec95398b55092ce48a11c875c1 Mon Sep 17 00:00:00 2001 From: toby cabot Date: Tue, 16 Oct 2018 16:38:01 -0400 Subject: [PATCH 2/2] Pin pluggy to 0.8.0 This isn't strictly necessary, but it looks as if this project prefers to pin its dev dependencies to an exact version (probably to prevent what happened today when a pluggy release caused the urllib3 build to start failing). --- dev-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-requirements.txt b/dev-requirements.txt index cba2818c5d..df3ed61097 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -11,3 +11,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