From f8f1d1c271ff24fc8bf51e104e83e7d53f31b3c4 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Thu, 16 Sep 2021 19:15:12 +0000
Subject: [PATCH] Pin protobuf<3.18 for Python<3.6

Our Google Cloud log upload role relies on google-cloud-storage,
which in turn needs protobuf. Unfortunately, protobuf dropped Python
2.7 and 3.5 support in its 3.18.0 release, so we use an environment
marker to pin it in our test requirements.

Change-Id: I89caf4e36850fc4a912b76d75f368144ddb5e15f
---
 test-requirements.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test-requirements.txt b/test-requirements.txt
index 87141b7b2..6b7cbda8c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -33,6 +33,8 @@ requestsexceptions
 bs4
 # For upload-logs-google
 google-cloud-storage
+# google-cloud-storage needs protobuf which dropped py27/35 support in 3.18.0
+protobuf<3.18;python_version<'3.6'
 
 # For upload-logs-s3
 boto3