From d773708c039ad398cf7a1bc017bd0fa1c0215067 Mon Sep 17 00:00:00 2001
From: Saman Vaisipour <svaisipour@gmail.com>
Date: Thu, 14 Nov 2019 15:37:33 -0500
Subject: [PATCH] Resolve google-resumable-media package conflict

This is casued by the conflict between:
* google-cloud-storage 1.23.0
* and google-cloud-bigquery < 1.22.0

More details here:
https://github.com/googleapis/google-cloud-python/issues/9786

Currently Beam is pinned to google-cloud-bigquery 1.17.0

https://github.com/apache/beam/blob/edf01c456d4ffbd17e5eee9a0dc2acb5693ed1f6/sdks/python/setup.py#L162

We have to pin to google-cloud-storage<1.23.0 until Beam updates to
google-cloud-bigquery<=1.22.0
---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 2a28a47bf..445ff1e4b 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,8 @@
     # Nucleus needs uptodate protocol buffer compiler (protoc).
     'protobuf>=3.6.1',
     'mmh3<2.6',
-    'google-cloud-storage',
+    # Refer to issue #528
+    'google-cloud-storage<1.23.0',
     'pyfarmhash'
 ]