From 97a29a1f7eb82bd50bb83dba978c401ae35c4e2a Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Wed, 15 Jan 2020 19:13:29 +0200 Subject: [PATCH] dvc: use pydrive2 instead of pydrive PyDrive2 is our maintained fork. --- dvc/remote/gdrive.py | 12 ++++++------ setup.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dvc/remote/gdrive.py b/dvc/remote/gdrive.py index 06e4f0814..8b788c684 100644 --- a/dvc/remote/gdrive.py +++ b/dvc/remote/gdrive.py @@ -34,7 +34,7 @@ class GDriveMissedCredentialKeyError(DvcException): @decorator def _wrap_pydrive_retriable(call): from apiclient import errors - from pydrive.files import ApiRequestError + from pydrive2.files import ApiRequestError try: result = call() @@ -61,7 +61,7 @@ gdrive_retry = compose( class RemoteGDrive(RemoteBASE): scheme = Schemes.GDRIVE path_cls = CloudURLInfo - REQUIRES = {"pydrive": "pydrive"} + REQUIRES = {"pydrive2": "pydrive2"} GDRIVE_USER_CREDENTIALS_DATA = "GDRIVE_USER_CREDENTIALS_DATA" DEFAULT_USER_CREDENTIALS_FILE = "gdrive-user-credentials.json" @@ -177,11 +177,11 @@ class RemoteGDrive(RemoteBASE): @property @wrap_with(threading.RLock()) def drive(self): - from pydrive.auth import RefreshError + from pydrive2.auth import RefreshError if not hasattr(self, "_gdrive"): - from pydrive.auth import GoogleAuth - from pydrive.drive import GoogleDrive + from pydrive2.auth import GoogleAuth + from pydrive2.drive import GoogleDrive if os.getenv(RemoteGDrive.GDRIVE_USER_CREDENTIALS_DATA): with open( @@ -227,7 +227,7 @@ class RemoteGDrive(RemoteBASE): self.gdrive_user_credentials_path, str(exc) ) ) - # Handle pydrive.auth.AuthenticationError and others auth failures + # Handle pydrive2.auth.AuthenticationError and others auth failures except Exception as exc: raise DvcException( "Google Drive authentication failed" diff --git a/setup.py b/setup.py index 38d1574d1..d9d13a4bd 100644 --- a/setup.py +++ b/setup.py @@ -86,7 +86,7 @@ gs = ["google-cloud-storage==1.19.0"] # google-api-python-client is internal dependency of pydrive. After merge of # https://github.com/gsuitedevs/PyDrive/pull/180 into pydrive's master, # usage of google-api-python-client can be removed from DVC. -gdrive = ["pydrive>=1.3.1", "google-api-python-client>=1.2"] +gdrive = ["pydrive2>=1.4.0", "google-api-python-client>=1.2"] s3 = ["boto3>=1.9.201"] azure = ["azure-storage-blob==2.1.0"] oss = ["oss2==2.6.1"]