From 9b89234199a7ea0360e709e3a9705d58966991fe Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Tue, 19 Nov 2019 14:26:43 -0800 Subject: [PATCH 1/3] fix: Use different versions of pytest for python 2 and python3 --- testing/requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testing/requirements.txt b/testing/requirements.txt index 4d7a193e0a8..fa26505e798 100644 --- a/testing/requirements.txt +++ b/testing/requirements.txt @@ -6,6 +6,8 @@ mock==3.0.5 mysql-python==1.2.5; python_version < "3.0" PyCrypto==2.6.1 pytest-cov==2.8.1 +pytest==5.3.0; python_version > "3.0" +pytest==4.6.6; python_version < "3.0" pytest==5.2.1 pyyaml==5.1.2 responses==0.10.6 From 30ffd9e15b0f2931c4b8caf51cf3713879ee0557 Mon Sep 17 00:00:00 2001 From: Christopher Wilcox Date: Tue, 19 Nov 2019 14:27:58 -0800 Subject: [PATCH 2/3] fix: delete extra pytest dep --- testing/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/testing/requirements.txt b/testing/requirements.txt index fa26505e798..e9debc12e31 100644 --- a/testing/requirements.txt +++ b/testing/requirements.txt @@ -8,7 +8,6 @@ PyCrypto==2.6.1 pytest-cov==2.8.1 pytest==5.3.0; python_version > "3.0" pytest==4.6.6; python_version < "3.0" -pytest==5.2.1 pyyaml==5.1.2 responses==0.10.6 WebTest==2.0.33 From 5602fe40f0bf0010e6d3a19d4a0cf60276d656d9 Mon Sep 17 00:00:00 2001 From: Chris Wilcox Date: Tue, 19 Nov 2019 20:42:15 -0800 Subject: [PATCH 3/3] fix: update pytest dependencies in requirements.txt --- container_registry/container_analysis/requirements.txt | 3 ++- functions/imagemagick/requirements-dev.txt | 3 ++- run/image-processing/requirements.txt | 3 ++- run/logging-manual/requirements.txt | 3 ++- run/pubsub/requirements.txt | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/container_registry/container_analysis/requirements.txt b/container_registry/container_analysis/requirements.txt index f693ca11ba7..dddaaacd851 100644 --- a/container_registry/container_analysis/requirements.txt +++ b/container_registry/container_analysis/requirements.txt @@ -1,6 +1,7 @@ google-cloud-pubsub==1.0.0 google-cloud-containeranalysis==0.3.0 grafeas==0.1.0 -pytest==5.1.3 +pytest==5.3.0; python_version > "3.0" +pytest==4.6.6; python_version < "3.0" flaky==3.6.1 mock==3.0.5 diff --git a/functions/imagemagick/requirements-dev.txt b/functions/imagemagick/requirements-dev.txt index 9bdb24049c4..f77abc4e216 100644 --- a/functions/imagemagick/requirements-dev.txt +++ b/functions/imagemagick/requirements-dev.txt @@ -1,4 +1,5 @@ mock==3.0.5 six==1.12.0 uuid==1.30 -pytest==5.1.3 +pytest==5.3.0; python_version > "3.0" +pytest==4.6.6; python_version < "3.0" \ No newline at end of file diff --git a/run/image-processing/requirements.txt b/run/image-processing/requirements.txt index 10798d4b790..fd657bcf7ed 100644 --- a/run/image-processing/requirements.txt +++ b/run/image-processing/requirements.txt @@ -1,5 +1,6 @@ Flask==1.1.1 -pytest==5.1.3 +pytest==5.3.0; python_version > "3.0" +pytest==4.6.6; python_version < "3.0" gunicorn==19.9.0 google-cloud-vision==0.39.0 google-cloud-storage==1.19.1 diff --git a/run/logging-manual/requirements.txt b/run/logging-manual/requirements.txt index d166fe0cc7f..6e6a703da32 100644 --- a/run/logging-manual/requirements.txt +++ b/run/logging-manual/requirements.txt @@ -1,3 +1,4 @@ Flask==1.1.1 -pytest==5.1.3 +pytest==5.3.0; python_version > "3.0" +pytest==4.6.6; python_version < "3.0" gunicorn==19.9.0 diff --git a/run/pubsub/requirements.txt b/run/pubsub/requirements.txt index d166fe0cc7f..6e6a703da32 100644 --- a/run/pubsub/requirements.txt +++ b/run/pubsub/requirements.txt @@ -1,3 +1,4 @@ Flask==1.1.1 -pytest==5.1.3 +pytest==5.3.0; python_version > "3.0" +pytest==4.6.6; python_version < "3.0" gunicorn==19.9.0