From 224ecd8fe0a1da34ccf542e441a94a77e0739353 Mon Sep 17 00:00:00 2001 From: ali-tny Date: Fri, 12 Aug 2022 10:13:41 +0900 Subject: [PATCH 1/4] Correct version number in CHANGELOG Also make formatting of bullet points consistent across the file --- CHANGELOG.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 1f57e91..45c2cb4 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,11 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.0.3] - 2022-02-07 +## [0.0.2] - 2022-02-07 ### Added - - Add click command for generating gdrive token - - Bump tentaclio install requirement >= 1.0.3 +- Add click command for generating gdrive token +- Bump tentaclio install requirement >= 1.0.3 ## [0.0.1] - 2021-11-26 ### Added - - Google drive client. +- Google drive client. From 0ebbc8bac493c9262dd6ea7469babd48390963dd Mon Sep 17 00:00:00 2001 From: ali-tny Date: Fri, 12 Aug 2022 10:18:12 +0900 Subject: [PATCH 2/4] Add CHANGELOG links and "Unreleased" section To follow the keep a change log (https://keepachangelog.com/en/1.0.0/) format properly, including using the recommended markdown format. Links provide users a place to see all the changes from one release to another, and the unreleased section means that each PR can update the "Unreleased" section, and then keeping the changelog up to date at release time is super easy (just turn "Unreleased" to the version name and make a new empty unreleased section). --- CHANGELOG.txt => CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) rename CHANGELOG.txt => CHANGELOG.md (63%) diff --git a/CHANGELOG.txt b/CHANGELOG.md similarity index 63% rename from CHANGELOG.txt rename to CHANGELOG.md index 45c2cb4..caa051f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + ## [0.0.2] - 2022-02-07 ### Added - Add click command for generating gdrive token @@ -12,3 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [0.0.1] - 2021-11-26 ### Added - Google drive client. + +[Unreleased]: https://github.com/octoenergy/tentaclio-gdrive/compare/0.0.2...HEAD +[0.0.2]: https://github.com/octoenergy/tentaclio-gdrive/compare/0.0.1...0.0.2 +[0.0.1]: https://github.com/octoenergy/tentaclio-gdrive/releases/tag/0.0.1 From 6600dde35ad5c83780c335eac13a27344f4087f1 Mon Sep 17 00:00:00 2001 From: ali-tny Date: Mon, 8 Aug 2022 09:47:08 +0900 Subject: [PATCH 3/4] Use new team drives arg instead of deprecated one Also the calling signature for using this argument when creating files was incorrect, so I update it to be a argument of the actual method rather than being in the args variable. --- CHANGELOG.md | 2 ++ src/tentaclio_gdrive/clients/google_drive_client.py | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index caa051f..51bbfa6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed +- Fix writing to shared drives by using the appropriate non-deprecated API parameter ## [0.0.2] - 2022-02-07 ### Added diff --git a/src/tentaclio_gdrive/clients/google_drive_client.py b/src/tentaclio_gdrive/clients/google_drive_client.py index c000115..c15b785 100644 --- a/src/tentaclio_gdrive/clients/google_drive_client.py +++ b/src/tentaclio_gdrive/clients/google_drive_client.py @@ -244,7 +244,7 @@ def remove(self): leaf_descriptor = self._get_leaf_descriptor() args = { "fileId": leaf_descriptor.id_, - "supportsTeamDrives": True, + "supportsAllDrives": True, } self._service.files().delete(**args).execute() # type: ignore @@ -311,7 +311,7 @@ class _DownloadRequest(_GoogleDriveRequest): def __init__(self, service: Any, file_id: str, writer: protocols.ByteWriter, **kwargs): super().__init__(service, kwargs) self.args["fileId"] = file_id - self.args["supportsTeamDrives"] = True + self.args["supportsAllDrives"] = True self.writer = writer def execute(self): @@ -329,8 +329,6 @@ def __init__( self, service: Any, name: str, parent_id: str, reader: protocols.ByteReader, **kwargs ): super().__init__(service, kwargs) - # self.args["parents"] = [parent_id] - self.args["supportsTeamDrives"] = True self.args["name"] = name self.args["parents"] = [parent_id] self.reader = reader @@ -342,6 +340,7 @@ def execute(self): self.service.files().create( body=self.args, media_body=media_body, + supportsAllDrives=True, ).execute() @@ -353,7 +352,7 @@ def __init__( ): super().__init__(service, kwargs) # self.args["parents"] = [parent_id] - self.args["supportsTeamDrives"] = True + self.args["supportsAllDrives"] = True self.args["fileId"] = file_id self.name = name self.reader = reader @@ -397,7 +396,7 @@ class _ListFilesRequest(_Lister[_GoogleFileDescriptor]): def __init__(self, service: Any, url_base: Optional[str] = None, **kwargs): super().__init__(service, **kwargs) # Get team drives too - self.args["supportsTeamDrives"] = True + self.args["supportsAllDrives"] = True self.args["includeTeamDriveItems"] = True self.args["fields"] = "files(id, name, mimeType, parents)" self.url_base = url_base From dd5676e34a0d832ae4ad776de7f3e2f07d22138a Mon Sep 17 00:00:00 2001 From: ali-tny Date: Fri, 12 Aug 2022 10:28:50 +0900 Subject: [PATCH 4/4] Prepare 0.0.3 release --- CHANGELOG.md | 5 ++++- setup.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51bbfa6..240fbc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [0.0.3] - 2022-08-12 ### Fixed - Fix writing to shared drives by using the appropriate non-deprecated API parameter @@ -17,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Google drive client. -[Unreleased]: https://github.com/octoenergy/tentaclio-gdrive/compare/0.0.2...HEAD +[Unreleased]: https://github.com/octoenergy/tentaclio-gdrive/compare/0.0.3...HEAD +[0.0.3]: https://github.com/octoenergy/tentaclio-gdrive/compare/0.0.2...0.0.3 [0.0.2]: https://github.com/octoenergy/tentaclio-gdrive/compare/0.0.1...0.0.2 [0.0.1]: https://github.com/octoenergy/tentaclio-gdrive/releases/tag/0.0.1 diff --git a/setup.py b/setup.py index a569cfc..196e718 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ # allow setup.py to be run from any path os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) -VERSION = "0.0.2" +VERSION = "0.0.3" REPO_ROOT = pathlib.Path(__file__).parent