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

Jump to bottom

[BEAM-12447] Upgrade cloud build client and add/cleanup SdkContainerBuilder options #17032

Merged
merged 1 commit into from
Mar 9, 2022
Merged

[BEAM-12447] Upgrade cloud build client and add/cleanup SdkContainerBuilder options #17032

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
9 changes: 3 additions & 6 deletions sdks/python/apache_beam/options/pipeline_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,14 +1149,11 @@ def _add_argparse_args(cls, parser):
'can also subclass SdkContainerImageBuilder and use that to build '
'in other environments.'))
parser.add_argument(
'--prebuild_sdk_container_base_image',
'--cloud_build_machine_type',
default=None,
help=(
'The base image to use when pre-building the sdk container image '
'with dependencies, if not specified, by default the released '
'public apache beam python sdk container image corresponding to '
'the sdk version will be used, if a dev sdk is used the base '
'image will default to the latest released sdk image.'))
'If specified, use the machine type explicitly when prebuilding'
'SDK container image on Google Cloud Build.'))
parser.add_argument(
'--docker_registry_push_url',
default=None,
Expand Down
5 changes: 5 additions & 0 deletions sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
Dataflow client utility functions."""

# pytype: skip-file
# To regenerate the client:
# pip install google-apitools[cli]
# gen_client --discovery_url=cloudbuild.v1 --overwrite \
# --outdir=apache_beam/runners/dataflow/internal/clients/cloudbuild \
# --root_package=. client

import codecs
from functools import partial
Expand Down
2 changes: 0 additions & 2 deletions sdks/python/apache_beam/runners/dataflow/internal/clients/cloudbuild/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,9 @@
# pylint: disable=wrong-import-order, wrong-import-position
try:
from apitools.base.py import *

from apache_beam.runners.dataflow.internal.clients.cloudbuild.cloudbuild_v1_client import *
from apache_beam.runners.dataflow.internal.clients.cloudbuild.cloudbuild_v1_messages import *
except ImportError:
pass
# pylint: enable=wrong-import-order, wrong-import-position

__path__ = pkgutil.extend_path(__path__, __name__)
Loading