From e7665956876c51b1bdbd519f6e9980e992f26869 Mon Sep 17 00:00:00 2001 From: pawel Date: Fri, 30 Aug 2019 12:03:19 +0200 Subject: [PATCH 1/5] workaround for google-resumable-media==0.3.3 build problem --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b69333af5..4e3c30df9 100644 --- a/setup.py +++ b/setup.py @@ -71,7 +71,7 @@ else: install_requires.append("networkx>=2.1") # Extra dependencies for remote integrations -gs = ["google-cloud-storage==1.13.0"] +gs = ["google-resumable-media==0.3.2", "google-cloud-storage==1.13.0"] s3 = ["boto3==1.9.115"] azure = ["azure-storage-blob==2.1.0"] oss = ["oss2==2.6.1"] From 3c01f07ffdb3407d3f98a50620a5739d3131e064 Mon Sep 17 00:00:00 2001 From: pawel Date: Fri, 30 Aug 2019 14:04:12 +0200 Subject: [PATCH 2/5] setup: add note why we restrict google-resumable-media version --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py index 4e3c30df9..e99db79a6 100644 --- a/setup.py +++ b/setup.py @@ -71,6 +71,10 @@ else: install_requires.append("networkx>=2.1") # Extra dependencies for remote integrations + +# Restricting google-resumable-media version is due to fact that +# since 0.3.3 our builds for Linux and MacOs started to fail. This restriction +# is temporary and should be removed ASAP gs = ["google-resumable-media==0.3.2", "google-cloud-storage==1.13.0"] s3 = ["boto3==1.9.115"] azure = ["azure-storage-blob==2.1.0"] From 48ac0b7c27f26e730eff4228804ee125b4d52a9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Redzy=C5=84ski?= Date: Fri, 30 Aug 2019 18:13:40 +0200 Subject: [PATCH 3/5] Update setup.py Co-Authored-By: Ruslan Kuprieiev --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e99db79a6..9f73a200e 100644 --- a/setup.py +++ b/setup.py @@ -72,7 +72,7 @@ else: # Extra dependencies for remote integrations -# Restricting google-resumable-media version is due to fact that +# Restricting google-resumable-media version is due to the fact that # since 0.3.3 our builds for Linux and MacOs started to fail. This restriction # is temporary and should be removed ASAP gs = ["google-resumable-media==0.3.2", "google-cloud-storage==1.13.0"] From bd04972e9e4115d0658f3ec3239cf105bb34509c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Redzy=C5=84ski?= Date: Fri, 30 Aug 2019 18:13:49 +0200 Subject: [PATCH 4/5] Update setup.py Co-Authored-By: Ruslan Kuprieiev --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9f73a200e..ef9255426 100644 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ else: # Extra dependencies for remote integrations # Restricting google-resumable-media version is due to the fact that -# since 0.3.3 our builds for Linux and MacOs started to fail. This restriction +# since 0.3.3 our binaries built by pyinstaller started to fail on Linux and macOS. This restriction will be removed after https://github.com/iterative/dvc/issues/2441 is resolved. # is temporary and should be removed ASAP gs = ["google-resumable-media==0.3.2", "google-cloud-storage==1.13.0"] s3 = ["boto3==1.9.115"] From 331ab8c983c83c41fdca3c1960ceed24a62cfa52 Mon Sep 17 00:00:00 2001 From: pawel Date: Fri, 30 Aug 2019 18:29:35 +0200 Subject: [PATCH 5/5] refactor note --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index ef9255426..83db8b3fb 100644 --- a/setup.py +++ b/setup.py @@ -73,8 +73,9 @@ else: # Extra dependencies for remote integrations # Restricting google-resumable-media version is due to the fact that -# since 0.3.3 our binaries built by pyinstaller started to fail on Linux and macOS. This restriction will be removed after https://github.com/iterative/dvc/issues/2441 is resolved. -# is temporary and should be removed ASAP +# since 0.3.3 our binaries built by pyinstaller started to fail on Linux and +# macOS. This restriction will be removed after +# https://github.com/iterative/dvc/issues/2441 is resolved. gs = ["google-resumable-media==0.3.2", "google-cloud-storage==1.13.0"] s3 = ["boto3==1.9.115"] azure = ["azure-storage-blob==2.1.0"]