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.

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

feat(bigquerydatatransfer): undeprecate resource name helper methods; add py2 deprecation warning; bump copyright year to 2020 (via synth) #10226

Merged
merged 1 commit into from
Jan 30, 2020
Merged

feat(bigquerydatatransfer): undeprecate resource name helper methods; add py2 deprecation warning; bump copyright year to 2020 (via synth) #10226

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: 1 addition & 1 deletion bigquery_datatransfer/google/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright 2019 Google LLC
# Copyright 2020 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion bigquery_datatransfer/google/cloud/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright 2019 Google LLC
# Copyright 2020 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion bigquery_datatransfer/google/cloud/bigquery_datatransfer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright 2019 Google LLC
# Copyright 2020 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
13 changes: 12 additions & 1 deletion bigquery_datatransfer/google/cloud/bigquery_datatransfer_v1/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright 2019 Google LLC
# Copyright 2020 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -16,12 +16,23 @@


from __future__ import absolute_import
import sys
import warnings

from google.cloud.bigquery_datatransfer_v1 import types
from google.cloud.bigquery_datatransfer_v1.gapic import data_transfer_service_client
from google.cloud.bigquery_datatransfer_v1.gapic import enums


if sys.version_info[:2] == (2, 7):
message = (
"A future version of this library will drop support for Python 2.7."
"More details about Python 2 support for Google Cloud Client Libraries"
"can be found at https://cloud.google.com/python/docs/python2-sunset/"
)
warnings.warn(message, DeprecationWarning)


class DataTransferServiceClient(data_transfer_service_client.DataTransferServiceClient):
__doc__ = data_transfer_service_client.DataTransferServiceClient.__doc__
enums = enums
Expand Down
58 changes: 9 additions & 49 deletions ..._datatransfer/google/cloud/bigquery_datatransfer_v1/gapic/data_transfer_service_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright 2019 Google LLC
# Copyright 2020 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -90,12 +90,7 @@ def from_service_account_file(cls, filename, *args, **kwargs):

@classmethod
def location_path(cls, project, location):
"""DEPRECATED. Return a fully-qualified location string."""
warnings.warn(
"Resource name helper functions are deprecated.",
PendingDeprecationWarning,
stacklevel=1,
)
"""Return a fully-qualified location string."""
return google.api_core.path_template.expand(
"projects/{project}/locations/{location}",
project=project,
Expand All @@ -104,12 +99,7 @@ def location_path(cls, project, location):

@classmethod
def location_data_source_path(cls, project, location, data_source):
"""DEPRECATED. Return a fully-qualified location_data_source string."""
warnings.warn(
"Resource name helper functions are deprecated.",
PendingDeprecationWarning,
stacklevel=1,
)
"""Return a fully-qualified location_data_source string."""
return google.api_core.path_template.expand(
"projects/{project}/locations/{location}/dataSources/{data_source}",
project=project,
Expand All @@ -119,12 +109,7 @@ def location_data_source_path(cls, project, location, data_source):

@classmethod
def location_run_path(cls, project, location, transfer_config, run):
"""DEPRECATED. Return a fully-qualified location_run string."""
warnings.warn(
"Resource name helper functions are deprecated.",
PendingDeprecationWarning,
stacklevel=1,
)
"""Return a fully-qualified location_run string."""
return google.api_core.path_template.expand(
"projects/{project}/locations/{location}/transferConfigs/{transfer_config}/runs/{run}",
project=project,
Expand All @@ -135,12 +120,7 @@ def location_run_path(cls, project, location, transfer_config, run):

@classmethod
def location_transfer_config_path(cls, project, location, transfer_config):
"""DEPRECATED. Return a fully-qualified location_transfer_config string."""
warnings.warn(
"Resource name helper functions are deprecated.",
PendingDeprecationWarning,
stacklevel=1,
)
"""Return a fully-qualified location_transfer_config string."""
return google.api_core.path_template.expand(
"projects/{project}/locations/{location}/transferConfigs/{transfer_config}",
project=project,
Expand All @@ -150,24 +130,14 @@ def location_transfer_config_path(cls, project, location, transfer_config):

@classmethod
def project_path(cls, project):
"""DEPRECATED. Return a fully-qualified project string."""
warnings.warn(
"Resource name helper functions are deprecated.",
PendingDeprecationWarning,
stacklevel=1,
)
"""Return a fully-qualified project string."""
return google.api_core.path_template.expand(
"projects/{project}", project=project
)

@classmethod
def project_data_source_path(cls, project, data_source):
"""DEPRECATED. Return a fully-qualified project_data_source string."""
warnings.warn(
"Resource name helper functions are deprecated.",
PendingDeprecationWarning,
stacklevel=1,
)
"""Return a fully-qualified project_data_source string."""
return google.api_core.path_template.expand(
"projects/{project}/dataSources/{data_source}",
project=project,
Expand All @@ -176,12 +146,7 @@ def project_data_source_path(cls, project, data_source):

@classmethod
def project_run_path(cls, project, transfer_config, run):
"""DEPRECATED. Return a fully-qualified project_run string."""
warnings.warn(
"Resource name helper functions are deprecated.",
PendingDeprecationWarning,
stacklevel=1,
)
"""Return a fully-qualified project_run string."""
return google.api_core.path_template.expand(
"projects/{project}/transferConfigs/{transfer_config}/runs/{run}",
project=project,
Expand All @@ -191,12 +156,7 @@ def project_run_path(cls, project, transfer_config, run):

@classmethod
def project_transfer_config_path(cls, project, transfer_config):
"""DEPRECATED. Return a fully-qualified project_transfer_config string."""
warnings.warn(
"Resource name helper functions are deprecated.",
PendingDeprecationWarning,
stacklevel=1,
)
"""Return a fully-qualified project_transfer_config string."""
return google.api_core.path_template.expand(
"projects/{project}/transferConfigs/{transfer_config}",
project=project,
Expand Down
2 changes: 1 addition & 1 deletion bigquery_datatransfer/google/cloud/bigquery_datatransfer_v1/gapic/enums.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright 2019 Google LLC
# Copyright 2020 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion ...e/cloud/bigquery_datatransfer_v1/gapic/transports/data_transfer_service_grpc_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Copyright 2019 Google LLC
# Copyright 2020 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
61 changes: 33 additions & 28 deletions bigquery_datatransfer/google/cloud/bigquery_datatransfer_v1/proto/datatransfer_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions bigquery_datatransfer/google/cloud/bigquery_datatransfer_v1/proto/transfer.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ option java_outer_classname = "TransferProto";
option java_package = "com.google.cloud.bigquery.datatransfer.v1";
option objc_class_prefix = "GCBDT";
option php_namespace = "Google\\Cloud\\BigQuery\\DataTransfer\\V1";
option (google.api.resource_definition) = {
type: "bigquerydatatransfer.google.com/Parent"
pattern: "projects/{project}"
pattern: "projects/{project}/locations/{location}"
};

// DEPRECATED. Represents data transfer type.
enum TransferType {
Expand Down
Loading