From 5f7f3f02dcca9aa0c3a9c66d49b2aef067dc7cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Sat, 14 Mar 2020 14:55:38 +0100 Subject: [PATCH 1/4] Update required google-api-python-client version I enforce google-api-python-client to be lower than v1.5.0, because otherwise it is necessary to increase the minimum version of httplib2 to v0.9.1. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8461cd4..ad97197 100755 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ ], install_requires = [ 'docopt >= 0.6.0', - 'google-api-python-client >= 1.2', + 'google-api-python-client >= 1.2, < 1.5.0', 'httplib2 >= 0.8', 'oauth2client >= 1.1', 'python-dateutil >= 1.5', From dbe0976f04bb5eb27869025f91812c65780eaefe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Sat, 14 Mar 2020 15:19:00 +0100 Subject: [PATCH 2/4] Update required oauth2client version It is not possible to use versions equal or greater than v4.0.0 because the subpackage oauth2client.util was removed. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ad97197..30a7a5c 100755 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ 'docopt >= 0.6.0', 'google-api-python-client >= 1.2, < 1.5.0', 'httplib2 >= 0.8', - 'oauth2client >= 1.1', + 'oauth2client >= 1.1, < 4.0.0', 'python-dateutil >= 1.5', 'python-gflags >= 2.0', 'python-magic >= 0.4.6', From 27d25e094bb7a58e15f6007183bba8f8312e7ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Sat, 14 Mar 2020 16:52:34 +0100 Subject: [PATCH 3/4] Patch credential non-storage after verification --- libgsync/drive/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libgsync/drive/__init__.py b/libgsync/drive/__init__.py index 30fa8be..dcb0f6f 100644 --- a/libgsync/drive/__init__.py +++ b/libgsync/drive/__init__.py @@ -345,6 +345,8 @@ def service(self): if credentials is None: credentials = self._obtain_credentials() + if storage is not None: + storage.put(credentials) debug("Authenticating") import httplib2 From dfc67c9f191fb0150cab9a38d27e9a60c5dfc139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Molina=20Garc=C3=ADa?= Date: Sat, 14 Mar 2020 17:54:33 +0100 Subject: [PATCH 4/4] Add version top limit for httplib2 This needs to be done because google-api-python-client is incompatible with any version of httplib2 greater than 0.15.0. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 30a7a5c..f371225 100755 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ install_requires = [ 'docopt >= 0.6.0', 'google-api-python-client >= 1.2, < 1.5.0', - 'httplib2 >= 0.8', + 'httplib2 >= 0.8, < 0.16.0', 'oauth2client >= 1.1, < 4.0.0', 'python-dateutil >= 1.5', 'python-gflags >= 2.0',