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

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions spanner/google/cloud/spanner_admin_database_v1/gapic/database_admin_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Accesses the google.spanner.admin.database.v1 DatabaseAdmin API."""

import functools
Expand Down Expand Up @@ -43,6 +44,7 @@
from google.longrunning import operations_pb2
from google.protobuf import empty_pb2


_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution("google-cloud-spanner").version


Expand Down
1 change: 1 addition & 0 deletions spanner/google/cloud/spanner_admin_database_v1/gapic/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Wrappers for protocol buffer enum types."""

import enum
Expand Down
1 change: 1 addition & 0 deletions .../google/cloud/spanner_admin_database_v1/gapic/transports/database_admin_grpc_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.


import google.api_core.grpc_helpers
import google.api_core.operations_v1

Expand Down
1 change: 1 addition & 0 deletions spanner/google/cloud/spanner_admin_instance_v1/gapic/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Wrappers for protocol buffer enum types."""

import enum
Expand Down
2 changes: 2 additions & 0 deletions spanner/google/cloud/spanner_admin_instance_v1/gapic/instance_admin_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Accesses the google.spanner.admin.instance.v1 InstanceAdmin API."""

import functools
Expand Down Expand Up @@ -44,6 +45,7 @@
from google.protobuf import empty_pb2
from google.protobuf import field_mask_pb2


_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution("google-cloud-spanner").version


Expand Down
1 change: 1 addition & 0 deletions .../google/cloud/spanner_admin_instance_v1/gapic/transports/instance_admin_grpc_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.


import google.api_core.grpc_helpers
import google.api_core.operations_v1

Expand Down
1 change: 1 addition & 0 deletions spanner/google/cloud/spanner_v1/gapic/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Wrappers for protocol buffer enum types."""

import enum
Expand Down
2 changes: 2 additions & 0 deletions spanner/google/cloud/spanner_v1/gapic/spanner_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Accesses the google.spanner.v1 Spanner API."""

import functools
Expand Down Expand Up @@ -42,6 +43,7 @@
from google.protobuf import empty_pb2
from google.protobuf import struct_pb2


_GAPIC_LIBRARY_VERSION = pkg_resources.get_distribution("google-cloud-spanner").version


Expand Down
2 changes: 0 additions & 2 deletions spanner/google/cloud/spanner_v1/gapic/transports/spanner_grpc_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# 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",
)


import google.api_core.grpc_helpers

Expand Down
10 changes: 5 additions & 5 deletions spanner/synth.metadata
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"updateTime": "2019-05-09T18:33:02.121279Z",
"updateTime": "2019-05-21T12:31:40.316493Z",
"sources": [
{
"generator": {
"name": "artman",
"version": "0.19.0",
"dockerImage": "googleapis/artman@sha256:d3df563538225ac6caac45d8ad86499500211d1bcb2536955a6dbda15e1b368e"
"version": "0.20.0",
"dockerImage": "googleapis/artman@sha256:3246adac900f4bdbd62920e80de2e5877380e44036b3feae13667ec255ebf5ec"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
"sha": "f86c9531dc49d41267e2117ece1ea29840f15ce3",
"internalRef": "247457584"
"sha": "32a10f69e2c9ce15bba13ab1ff928bacebb25160",
"internalRef": "249058354"
}
},
{
Expand Down
1 change: 1 addition & 0 deletions spanner/tests/unit/gapic/v1/test_database_admin_client_v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Unit tests."""

import mock
Expand Down
1 change: 1 addition & 0 deletions spanner/tests/unit/gapic/v1/test_instance_admin_client_v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Unit tests."""

import mock
Expand Down
1 change: 1 addition & 0 deletions spanner/tests/unit/gapic/v1/test_spanner_client_v1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Unit tests."""

import mock
Expand Down