Skip to content

[DO NOT MERGE] Spanner: Add empty lines, remove ~~unused~~needed imports (via synth). #8071

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.

Sign up for GitHub

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

Jump to bottom
Closed
yoshi-automation wants to merge 1 commit into from
Closed

[DO NOT MERGE] Spanner: Add empty lines, remove ~~unused~~needed imports (via synth). #8071

yoshi-automation wants to merge 1 commit into from

Conversation

@yoshi-automation
Copy link
Contributor

@yoshi-automation yoshi-automation commented May 21, 2019

This PR was generated using Autosynth. 🌈

Here's the log from Synthtool:

synthtool > Executing /tmpfs/src/git/autosynth/working_repo/spanner/synth.py.
synthtool > Ensuring dependencies.
synthtool > Pulling artman image.
latest: Pulling from googleapis/artman
Digest: sha256:3246adac900f4bdbd62920e80de2e5877380e44036b3feae13667ec255ebf5ec
Status: Image is up to date for googleapis/artman:latest
synthtool > Cloning googleapis.
synthtool > Running generator for google/spanner/artman_spanner.yaml.
synthtool > Generated code into /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-v1.
synthtool > Copy: /home/kbuilder/.cache/synthtool/googleapis/google/spanner/v1/mutation.proto to /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-v1/google/cloud/spanner_v1/proto/mutation.proto
synthtool > Copy: /home/kbuilder/.cache/synthtool/googleapis/google/spanner/v1/spanner.proto to /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-v1/google/cloud/spanner_v1/proto/spanner.proto
synthtool > Copy: /home/kbuilder/.cache/synthtool/googleapis/google/spanner/v1/type.proto to /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-v1/google/cloud/spanner_v1/proto/type.proto
synthtool > Copy: /home/kbuilder/.cache/synthtool/googleapis/google/spanner/v1/keys.proto to /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-v1/google/cloud/spanner_v1/proto/keys.proto
synthtool > Copy: /home/kbuilder/.cache/synthtool/googleapis/google/spanner/v1/result_set.proto to /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-v1/google/cloud/spanner_v1/proto/result_set.proto
synthtool > Copy: /home/kbuilder/.cache/synthtool/googleapis/google/spanner/v1/transaction.proto to /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-v1/google/cloud/spanner_v1/proto/transaction.proto
synthtool > Copy: /home/kbuilder/.cache/synthtool/googleapis/google/spanner/v1/query_plan.proto to /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-v1/google/cloud/spanner_v1/proto/query_plan.proto
synthtool > Placed proto files into /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-v1/google/cloud/spanner_v1/proto.
synthtool > No replacements made in google/cloud/spanner_v1/gapic/transports/spanner_grpc_transport.py for pattern # limitations under the License.

import google.api_core.grpc_helpers
, maybe replacement is not longer needed?
synthtool > Replaced 'from google.cloud.spanner_v1.proto import spanner_pb2_grpc\n' in google/cloud/spanner_v1/gapic/transports/spanner_grpc_transport.py.
synthtool > Replaced '(\\s+)return google.api_core.grpc_helpers.create_channel\\(\n' in google/cloud/spanner_v1/gapic/transports/spanner_grpc_transport.py.
synthtool > Replaced 'from google.cloud import spanner_v1' in tests/unit/gapic/v1/test_spanner_client_v1.py.
synthtool > Running generator for google/spanner/admin/instance/artman_spanner_admin_instance.yaml.
synthtool > Generated code into /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-admin-instance-v1.
synthtool > Copy: /home/kbuilder/.cache/synthtool/googleapis/google/spanner/admin/instance/v1/spanner_instance_admin.proto to /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-admin-instance-v1/google/cloud/spanner_admin_instance_v1/proto/spanner_instance_admin.proto
synthtool > Placed proto files into /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-admin-instance-v1/google/cloud/spanner_admin_instance_v1/proto.
synthtool > Replaced "'google-cloud-spanner-admin-instance'" in google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py.
synthtool > Replaced 'from google\\.cloud\\.spanner\\.admin\\.instance_v1.proto' in google/cloud/spanner_admin_instance_v1/proto/spanner_instance_admin_pb2_grpc.py.
synthtool > Replaced '====*' in google/cloud/spanner_v1/proto/transaction_pb2.py.
synthtool > Replaced '----*' in google/cloud/spanner_v1/proto/transaction_pb2.py.
synthtool > Replaced '~~~~*' in google/cloud/spanner_v1/proto/transaction_pb2.py.
synthtool > Running generator for google/spanner/admin/database/artman_spanner_admin_database.yaml.
synthtool > Generated code into /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-admin-database-v1.
synthtool > Copy: /home/kbuilder/.cache/synthtool/googleapis/google/spanner/admin/database/v1/spanner_database_admin.proto to /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-admin-database-v1/google/cloud/spanner_admin_database_v1/proto/spanner_database_admin.proto
synthtool > Placed proto files into /home/kbuilder/.cache/synthtool/googleapis/artman-genfiles/python/spanner-admin-database-v1/google/cloud/spanner_admin_database_v1/proto.
synthtool > Replaced "'google-cloud-spanner-admin-database'" in google/cloud/spanner_admin_database_v1/gapic/database_admin_client.py.
synthtool > Replaced 'from google\\.cloud\\.spanner\\.admin\\.database_v1.proto' in google/cloud/spanner_admin_database_v1/proto/spanner_database_admin_pb2_grpc.py.
.coveragerc
.flake8
MANIFEST.in
noxfile.py.j2
setup.cfg
synthtool > Replaced 'include README.rst LICENSE\n' in MANIFEST.in.
Running session blacken
Creating virtualenv using python3.6 in /tmpfs/src/git/autosynth/working_repo/spanner/.nox/blacken
pip install black
black google tests docs
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_admin_database_v1/gapic/enums.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_admin_database_v1/gapic/database_admin_client_config.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_admin_database_v1/gapic/transports/database_admin_grpc_transport.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_admin_instance_v1/gapic/enums.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_admin_database_v1/proto/spanner_database_admin_pb2_grpc.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client_config.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_admin_instance_v1/gapic/transports/instance_admin_grpc_transport.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_admin_database_v1/gapic/database_admin_client.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_admin_database_v1/proto/spanner_database_admin_pb2.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_admin_instance_v1/proto/spanner_instance_admin_pb2_grpc.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/gapic/enums.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/gapic/spanner_client_config.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/gapic/transports/spanner_grpc_transport.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/keys_pb2_grpc.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/keys_pb2.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/mutation_pb2_grpc.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/mutation_pb2.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/query_plan_pb2_grpc.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/gapic/spanner_client.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/result_set_pb2_grpc.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/query_plan_pb2.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_admin_instance_v1/proto/spanner_instance_admin_pb2.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/result_set_pb2.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/transaction_pb2_grpc.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/spanner_pb2_grpc.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/type_pb2_grpc.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/type_pb2.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/transaction_pb2.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/tests/unit/gapic/v1/test_database_admin_client_v1.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/tests/unit/gapic/v1/test_instance_admin_client_v1.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/tests/unit/gapic/v1/test_spanner_client_v1.py
reformatted /tmpfs/src/git/autosynth/working_repo/spanner/google/cloud/spanner_v1/proto/spanner_pb2.py
All done! ✨ 🍰 ✨
33 files reformatted, 53 files left unchanged.
Session blacken was successful.
synthtool > Cleaned up 2 temporary directories.
synthtool > Wrote metadata to synth.metadata.

@yoshi-automation yoshi-automation requested a review from tseaver as a code owner May 21, 2019 12:32
@yoshi-automation yoshi-automation added the api: spanner Issues related to the Spanner API. label May 21, 2019
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label May 21, 2019
@busunkim96 busunkim96 changed the title [CHANGE ME] Re-generated spanner to pick up changes in the API or client library generator. Spanner: Add empty lines, remove unused imports (via synth). May 21, 2019
@busunkim96 busunkim96 added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label May 21, 2019
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label May 21, 2019
tseaver
tseaver previously approved these changes May 22, 2019
View reviewed changes
@tseaver tseaver dismissed their stale review May 22, 2019 20:18

Failing CI

tseaver
tseaver suggested changes May 22, 2019
View reviewed changes
spanner/google/cloud/spanner_v1/gapic/transports/spanner_grpc_transport.py
# limitations under the License.

import pkg_resources
import grpc_gcp
Copy link
Contributor

@tseaver tseaver May 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These imports are absolutely required: both modules are used below in the file.

Copy link
Contributor

@tseaver tseaver May 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like adding the extra line broke our replacement in synth.py:

google-cloud-python/spanner/synth.py

Lines 37 to 47 in ba1ddc2

# Add grpcio-gcp options
s.replace(
"google/cloud/spanner_v1/gapic/transports/spanner_grpc_transport.py",
"# limitations under the License.\n" "\n" "import google.api_core.grpc_helpers\n",
"# limitations under the License.\n"
"\n"
"import pkg_resources\n"
"import grpc_gcp\n"
"\n"
"import google.api_core.grpc_helpers\n",
)

@tseaver tseaver added do not merge Indicates a pull request not ready for merge, due to either quality or timing. needs work This is a pull request that needs a little love. labels May 22, 2019
@tseaver tseaver changed the title Spanner: Add empty lines, remove unused imports (via synth). Spanner: Add empty lines, remove ~~unused~~needed imports (via synth). May 22, 2019
@tseaver tseaver changed the title Spanner: Add empty lines, remove ~~unused~~needed imports (via synth). [DO NOT MERGE] Spanner: Add empty lines, remove ~~unused~~needed imports (via synth). May 22, 2019
@tseaver tseaver mentioned this pull request May 22, 2019
Merged
@tseaver
Copy link
Contributor

tseaver commented May 22, 2019

Superseded by #8103.

@tseaver tseaver closed this May 22, 2019
@tseaver tseaver deleted the autosynth-spanner branch May 22, 2019 20:31
tseaver added a commit that referenced this pull request May 22, 2019
@tseaver
Harden synth replacement against template adding whitespace. (#8103)
54037bd 
Supersedes #8071.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@tseaver tseaver tseaver requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

api: spanner Issues related to the Spanner API. cla: yes This human has signed the Contributor License Agreement. codegen do not merge Indicates a pull request not ready for merge, due to either quality or timing. needs work This is a pull request that needs a little love.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@yoshi-automation @tseaver @googlebot @busunkim96 @yoshi-kokoro