Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vendor in apitools subset #388

Closed
wants to merge 3 commits into from
Closed

Vendor in apitools subset #388

wants to merge 3 commits into from

Conversation

tseaver
Copy link
Contributor

@tseaver tseaver commented Nov 25, 2014

Pulls in the subset of apitools which #334 claims can be used to implement upload / download in gcloud.storage.key). These four modules do not use google-protorpc at all.

Updates the vendored-in modules to use relative imports (since they will only be used when the "real"
apitools is not available).

Updates our CI configuration to suppress PEP8 / lint checking for the vendored code.

@tseaver tseaver added api: storage Issues related to the Cloud Storage API. type: feature request ‘Nice-to-have’ improvement, new feature or different behavior or design. labels Nov 25, 2014
@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 3206541 on tseaver:334-vendor-apitools-subset into 572b864 on GoogleCloudPlatform:master.

@@ -73,6 +76,9 @@ def make_test_rc(base_rc_filename, additions_dict, target_filename):

def valid_filename(filename):
"""Checks if a file is a Python file and is not ignored."""
for directory in IGNORED_DIRECTORIES:
if filename.startswith(directory):

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

@dhermes
Copy link
Contributor

dhermes commented Nov 26, 2014

What is the diff between the code in https://github.com/craigcitro/apitools and those committed here? Can we also commit

  • the SHA1 hash where we are syncing with the library
  • a .patch file encapsulating our diff

If there is no diff, I'd be a fan of using a git submodule and just adding symlinks in the places we need.

Even if there is a diff, we could apply the .patch file in setup.py, though the complexity is probably not worth it.

@tseaver
Copy link
Contributor Author

tseaver commented Nov 26, 2014

What is the diff between the code in https://github.com/craigcitro/apitools and those committed here?

This change copies in only the four modules expected (in #334) to be needed. It replaces the package-level __init__.py files with empty placeholders, and converts the imports to explicit relative form (from . import exceptions, for example).

Submodules are demon-spawn. :) We explicitly don't want all of apitools, because the bits that use protorpc are the problem we are trying to avoid.

I can see no benefit to applying a patch: we are going to have to garden these files by hand, but only until @craigcitro can get apitools to a released version supporting our desired versions (including transitive dependencies).

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 787a4d9 on tseaver:334-vendor-apitools-subset into 572b864 on GoogleCloudPlatform:master.

@dhermes
Copy link
Contributor

dhermes commented Nov 26, 2014

I made https://gist.github.com/dhermes/0ba88c5dab4be4e60b9e with a patch file.

I am fine gardening the files by hand, but want to keep a clear record of how and when we changed it.

Hopefully it is quite temporary.

As for the imports, is there any reason we don't instead use absolute imports, since the path is fully under our control?

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling e8d924a on tseaver:334-vendor-apitools-subset into 3b90004 on GoogleCloudPlatform:master.

- '__init__.py' files are stubs, w/o namespace support.  Deleted package-level
  'from <foo> import *' convenience imports.

- Non-'__init__.py' files pulled from:
  craigcitro/apitools@e5a5c36

- Absolute imports converted to explicit relative.
@tseaver
Copy link
Contributor Author

tseaver commented Dec 2, 2014

Rebased against master, adding explicit reference to source commit, plus description of deltas.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling fcb7a5e on tseaver:334-vendor-apitools-subset into 3b90004 on GoogleCloudPlatform:master.

@dhermes
Copy link
Contributor

dhermes commented Dec 2, 2014

Can you check in the content from the source commit as part of the repo? People are likely to give up going through commit history to find it.

I know this seems a bit over the top, but there is a chance we'll be burdened with this code for awhile and I don't want to lose track of the delta from the source of "truth".

@tseaver tseaver closed this Dec 2, 2014
@tseaver
Copy link
Contributor Author

tseaver commented Dec 2, 2014

I'll redo on a different PR.

@tseaver tseaver deleted the 334-vendor-apitools-subset branch December 2, 2014 19:28
parthea added a commit that referenced this pull request Jun 4, 2023
* fix(deps): allow protobuf 3.19.5

* explicitly exclude protobuf 4.21.0
parthea pushed a commit that referenced this pull request Jun 4, 2023
* fix: integrate  gapic-generator-python-1.4.1 and enable more py_test targets

PiperOrigin-RevId: 473833416

Source-Link: googleapis/googleapis@565a550

Source-Link: googleapis/googleapis-gen@1ee1a06
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMWVlMWEwNmM2ZGUzY2E4Yjg0MzU3MmMxZmRlMDU0OGY4NDIzNjk4OSJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
parthea added a commit that referenced this pull request Jul 6, 2023
…ge_classify_text.py (#388)

* docs: specify client library version requirement

* clarify comment

Co-authored-by: Anthonios Partheniou <partheniou@google.com>
parthea pushed a commit that referenced this pull request Sep 20, 2023
* chore: Update gapic-generator-python to v1.8.2

PiperOrigin-RevId: 504289125

Source-Link: googleapis/googleapis@38a48a4

Source-Link: googleapis/googleapis-gen@b2dc226
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjJkYzIyNjYzZGJlNDdhOTcyYzhkOGMyZjhhNGRmMDEzZGFmZGNiYyJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
vchudnov-g pushed a commit that referenced this pull request Sep 20, 2023
The previous file is removed since the parent project is deleted. Changed to use publicly available file.
parthea pushed a commit that referenced this pull request Sep 22, 2023
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
parthea pushed a commit that referenced this pull request Sep 22, 2023
)

Source-Link: googleapis/synthtool@7804ade
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:eede5672562a32821444a8e803fb984a6f61f2237ea3de229d2de24453f4ae7d
parthea pushed a commit that referenced this pull request Sep 22, 2023
parthea pushed a commit that referenced this pull request Sep 22, 2023
* docs: Minor formatting
chore: Update gapic-generator-python to v1.11.5
build: Update rules_python to 0.24.0

PiperOrigin-RevId: 563436317

Source-Link: googleapis/googleapis@42fd37b

Source-Link: googleapis/googleapis-gen@280264c
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjgwMjY0Y2EwMmZiOTMxNmI0MjM3YTk2ZDBhZjFhMjM0M2E4MWE1NiJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
parthea added a commit that referenced this pull request Sep 22, 2023
* fix(deps): Require google-api-core >=1.34.0, >=2.11.0

fix: Drop usage of pkg_resources

fix: Fix timeout default values

docs(samples): Snippetgen should call await on the operation coroutine before calling result

PiperOrigin-RevId: 493260409

Source-Link: googleapis/googleapis@fea4387

Source-Link: googleapis/googleapis-gen@387b734
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzg3YjczNDRjNzUyOWVlNDRiZTg0ZTYxM2IxOWE4MjA1MDhjNjEyYiJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* add gapic_version.py

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
@release-please release-please bot mentioned this pull request Sep 29, 2023
vchudnov-g pushed a commit that referenced this pull request Oct 2, 2023
🤖 I have created a release *beep* *boop*
---


<details><summary>google-ai-generativelanguage: 0.3.4</summary>

##
[0.3.4](google-ai-generativelanguage-v0.3.3...google-ai-generativelanguage-v0.3.4)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-apps-script-type: 0.3.4</summary>

##
[0.3.4](google-apps-script-type-v0.3.3...google-apps-script-type-v0.3.4)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-area120-tables: 0.11.4</summary>

##
[0.11.4](google-area120-tables-v0.11.3...google-area120-tables-v0.11.4)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-cloud-access-approval: 1.11.3</summary>

##
[1.11.3](google-cloud-access-approval-v1.11.2...google-cloud-access-approval-v1.11.3)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-cloud-advisorynotifications: 0.3.1</summary>

##
[0.3.1](google-cloud-advisorynotifications-v0.3.0...google-cloud-advisorynotifications-v0.3.1)
(2023-09-30)


### Features

* add new RPCs GetSettings, UpdateSettings and new messages Settings,
NotificationSettings, GetSettingsRequest, UpdateSettingsRequest
([e395513](e395513))
</details>

<details><summary>google-cloud-alloydb: 0.3.3</summary>

##
[0.3.3](google-cloud-alloydb-v0.3.2...google-cloud-alloydb-v0.3.3)
(2023-09-30)


### Features

* Add support to generate client certificate and get connection info
([0f72d58](0f72d58))
* Add support to generate client certificate and get connection info for
auth proxy in AlloyDB v1
([#11764](#11764))
([0f72d58](0f72d58))
</details>

<details><summary>google-cloud-api-gateway: 1.7.3</summary>

##
[1.7.3](google-cloud-api-gateway-v1.7.2...google-cloud-api-gateway-v1.7.3)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-cloud-api-keys: 0.5.4</summary>

##
[0.5.4](google-cloud-api-keys-v0.5.3...google-cloud-api-keys-v0.5.4)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-cloud-apigee-connect: 1.7.3</summary>

##
[1.7.3](google-cloud-apigee-connect-v1.7.2...google-cloud-apigee-connect-v1.7.3)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-cloud-apigee-registry: 0.6.4</summary>

##
[0.6.4](google-cloud-apigee-registry-v0.6.3...google-cloud-apigee-registry-v0.6.4)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-cloud-appengine-logging: 1.3.2</summary>

##
[1.3.2](google-cloud-appengine-logging-v1.3.1...google-cloud-appengine-logging-v1.3.2)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-cloud-artifact-registry: 1.8.4</summary>

##
[1.8.4](google-cloud-artifact-registry-v1.8.3...google-cloud-artifact-registry-v1.8.4)
(2023-09-30)


### Bug Fixes

* make repository and repository_id in CreateRepository required
([3b8ea3e](3b8ea3e))
</details>

<details><summary>google-cloud-bare-metal-solution: 1.5.1</summary>

##
[1.5.1](google-cloud-bare-metal-solution-v1.5.0...google-cloud-bare-metal-solution-v1.5.1)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-cloud-batch: 0.17.1</summary>

##
[0.17.1](google-cloud-batch-v0.17.0...google-cloud-batch-v0.17.1)
(2023-09-30)


### Documentation

* update batch PD interface support
([a300b07](a300b07))
</details>

<details><summary>google-cloud-beyondcorp-appconnections:
0.4.4</summary>

##
[0.4.4](google-cloud-beyondcorp-appconnections-v0.4.3...google-cloud-beyondcorp-appconnections-v0.4.4)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-cloud-beyondcorp-appconnectors: 0.4.4</summary>

##
[0.4.4](google-cloud-beyondcorp-appconnectors-v0.4.3...google-cloud-beyondcorp-appconnectors-v0.4.4)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-cloud-beyondcorp-appgateways: 0.4.4</summary>

##
[0.4.4](google-cloud-beyondcorp-appgateways-v0.4.3...google-cloud-beyondcorp-appgateways-v0.4.4)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-cloud-beyondcorp-clientconnectorservices:
0.4.4</summary>

##
[0.4.4](google-cloud-beyondcorp-clientconnectorservices-v0.4.3...google-cloud-beyondcorp-clientconnectorservices-v0.4.4)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-cloud-beyondcorp-clientgateways:
0.4.3</summary>

##
[0.4.3](google-cloud-beyondcorp-clientgateways-v0.4.2...google-cloud-beyondcorp-clientgateways-v0.4.3)
(2023-09-30)


### Documentation

* Minor formatting
([#11630](#11630))
([b176996](b176996))
</details>

<details><summary>google-cloud-bigquery-analyticshub: 0.4.3</summary>

##
[0.4.3](google-cloud-bigquery-analyticshub-v0.4.2...google-cloud-bigquery-analyticshub-v0.4.3)
(2023-09-30)


### Features

* add Subscription resource and RPCs
([a18915b](a18915b))
</details>

<details><summary>google-cloud-bigquery-connection: 1.13.2</summary>

##
[1.13.2](google-cloud-bigquery-connection-v1.13.1...google-cloud-bigquery-connection-v1.13.2)
(2023-09-30)


### Documentation

* Minor formatting
([#342](#342))
([cda2dc6](cda2dc6))
</details>

<details><summary>google-cloud-bigquery-datatransfer: 3.12.1</summary>

##
[3.12.1](google-cloud-bigquery-datatransfer-v3.12.0...google-cloud-bigquery-datatransfer-v3.12.1)
(2023-09-30)


### Documentation

* Update transferConfig.name description to indicate that it supports
both formats
([#494](#494))
([5141dc2](5141dc2))
</details>

<details><summary>google-cloud-bigquery-reservation: 1.11.3</summary>

##
[1.11.3](google-cloud-bigquery-reservation-v1.11.2...google-cloud-bigquery-reservation-v1.11.3)
(2023-09-30)


### Documentation

* Minor formatting
([#377](#377))
([2b8616a](2b8616a))
</details>

<details><summary>google-cloud-contact-center-insights: 1.13.0</summary>

##
[1.13.0](google-cloud-contact-center-insights-v1.12.1...google-cloud-contact-center-insights-v1.13.0)
(2023-09-30)


### Features

* add optional SpeechConfig to UploadConversationRequest
([bfc25b7](bfc25b7))
</details>

<details><summary>google-cloud-container: 2.32.0</summary>

##
[2.32.0](google-cloud-container-v2.31.0...google-cloud-container-v2.32.0)
(2023-09-30)


### Features

* add SecurityPostureConfig Enterprise vuln mode to allow customers to
enable Advanced Vulnerability Scanning for their clusters
([#413](#413))
([0280a30](0280a30))


### Documentation

* Minor formatting
([#411](#411))
([1408937](1408937))
</details>

<details><summary>google-cloud-contentwarehouse: 0.7.2</summary>

##
[0.7.2](google-cloud-contentwarehouse-v0.7.1...google-cloud-contentwarehouse-v0.7.2)
(2023-09-30)


### Features

* add matched_token_page_indices field in Document Warehouse API v1
([030a767](030a767))
</details>

<details><summary>google-cloud-datacatalog: 3.16.0</summary>

##
[3.16.0](google-cloud-datacatalog-v3.15.2...google-cloud-datacatalog-v3.16.0)
(2023-09-30)


### Features

* Enable Vertex AI Ingestion on DataPlex
([#11762](#11762))
([b9d7b71](b9d7b71))
</details>

<details><summary>google-cloud-dataproc-metastore: 1.13.0</summary>

##
[1.13.0](google-cloud-dataproc-metastore-v1.12.1...google-cloud-dataproc-metastore-v1.13.0)
(2023-09-30)


### Features

* added EndpointLocation (v1, v1beta, v1alpha)
([b254665](b254665))
</details>

<details><summary>google-cloud-dialogflow: 2.25.0</summary>

##
[2.25.0](google-cloud-dialogflow-v2.24.1...google-cloud-dialogflow-v2.25.0)
(2023-09-30)


### Features

* Add the enable_partial_automated_agent_reply flag
([2996e9b](2996e9b))
* Remove backend API deadline
([2996e9b](2996e9b))
</details>

<details><summary>google-cloud-dialogflow-cx: 1.28.0</summary>

##
[1.28.0](google-cloud-dialogflow-cx-v1.27.1...google-cloud-dialogflow-cx-v1.28.0)
(2023-09-30)


### Features

* add Inline destination
([40ee037](40ee037))
* add Intent import/export APIs
([40ee037](40ee037))
* add support for AdvancedSettings
([40ee037](40ee037))
</details>

<details><summary>google-cloud-network-connectivity: 2.2.0</summary>

##
[2.2.0](google-cloud-network-connectivity-v2.1.0...google-cloud-network-connectivity-v2.2.0)
(2023-09-30)


### Features

* add Network Connectivity Center APIs related to VPC spokes
([#11769](#11769))
([4cf708c](4cf708c))
</details>

<details><summary>google-cloud-os-config: 1.15.3</summary>

##
[1.15.3](google-cloud-os-config-v1.15.2...google-cloud-os-config-v1.15.3)
(2023-09-30)


### Documentation

* Minor formatting
([#295](#295))
([8805a43](8805a43))
</details>

<details><summary>google-cloud-scheduler: 2.11.2</summary>

##
[2.11.2](google-cloud-scheduler-v2.11.1...google-cloud-scheduler-v2.11.2)
(2023-09-30)


### Documentation

* Minor formatting
([#353](#353))
([951433b](951433b))
</details>

<details><summary>google-cloud-texttospeech: 2.14.2</summary>

##
[2.14.2](google-cloud-texttospeech-v2.14.1...google-cloud-texttospeech-v2.14.2)
(2023-09-30)


### Documentation

* Minor formatting
([#388](#388))
([c051f1b](c051f1b))
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
parthea pushed a commit that referenced this pull request Oct 21, 2023
Source-Link: https://togithub.com/googleapis/synthtool/commit/0ddbff8012e47cde4462fe3f9feab01fbc4cdfd6
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:bced5ca77c4dda0fd2f5d845d4035fc3c5d3d6b81f245246a36aee114970082b
parthea pushed a commit that referenced this pull request Oct 21, 2023
* feat: added VerifyConnectivity RPC

PiperOrigin-RevId: 530991686

Source-Link: googleapis/googleapis@be2600e

Source-Link: googleapis/googleapis-gen@7eadc0e
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiN2VhZGMwZTBhYWVjZTJiY2NiNGU1NjFmM2IyOWIwNTg0ZmJjZjkwNiJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
parthea pushed a commit that referenced this pull request Oct 21, 2023
* chore: Update gapic-generator-python to v1.11.7

PiperOrigin-RevId: 573230664

Source-Link: googleapis/googleapis@93beed3

Source-Link: googleapis/googleapis-gen@f4a4eda
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZjRhNGVkYWE4MDU3NjM5ZmNmNmFkZjkxNzk4NzIyODBkMWE4ZjY1MSJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore: Update gapic-generator-python to v1.11.8

PiperOrigin-RevId: 574178735

Source-Link: googleapis/googleapis@7307199

Source-Link: googleapis/googleapis-gen@ce3af21
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2UzYWYyMWI3YzU1OWE4N2MyYmVmYzA3NmJlMGUzYWVkYTNhMjZmMCJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
parthea pushed a commit that referenced this pull request Oct 21, 2023
Source-Link: googleapis/synthtool@453a5d9
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:81ed5ecdfc7cac5b699ba4537376f3563f6f04122c4ec9e735d3b3dc1d43dd32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api: storage Issues related to the Cloud Storage API. type: feature request ‘Nice-to-have’ improvement, new feature or different behavior or design.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants