This is an automated email from the ASF dual-hosted git repository.
tvalentyn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 6152a70d64b Update Dataflow dev container image tag. (#27545)
6152a70d64b is described below
commit 6152a70d64b08809940ec07c8df2d4f0168d49ec
Author: tvalentyn <tvalen...@users.noreply.github.com>
AuthorDate: Tue Jul 18 16:02:59 2023 -0700
Update Dataflow dev container image tag. (#27545)
---
.../apache_beam/runners/dataflow/internal/apiclient.py | 2 +-
.../apache_beam/runners/dataflow/internal/apiclient_test.py | 4 ++--
sdks/python/apache_beam/runners/dataflow/internal/names.py | 13 ++++---------
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
b/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
index ff1beeab510..5f1d3c0c329 100644
--- a/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
+++ b/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py
@@ -1160,7 +1160,7 @@ def _get_required_container_version():
current version of the SDK.
"""
if 'dev' in beam_version.__version__:
- return names.BEAM_FNAPI_CONTAINER_VERSION
+ return names.BEAM_DEV_SDK_CONTAINER_TAG
else:
return _get_container_image_tag()
diff --git
a/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py
b/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py
index 22e779a8c27..d639ad21c31 100644
--- a/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py
+++ b/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py
@@ -635,7 +635,7 @@ class UtilTest(unittest.TestCase):
'/beam_python%d.%d_sdk:%s' % (
sys.version_info[0],
sys.version_info[1],
- names.BEAM_FNAPI_CONTAINER_VERSION)))
+ names.BEAM_DEV_SDK_CONTAINER_TAG)))
pipeline_options = PipelineOptions(
['--temp_location', 'gs://any-location/temp'])
@@ -651,7 +651,7 @@ class UtilTest(unittest.TestCase):
'/beam_python%d.%d_sdk:%s' % (
sys.version_info[0],
sys.version_info[1],
- names.BEAM_FNAPI_CONTAINER_VERSION)))
+ names.BEAM_DEV_SDK_CONTAINER_TAG)))
@mock.patch(
'apache_beam.runners.dataflow.internal.apiclient.'
diff --git a/sdks/python/apache_beam/runners/dataflow/internal/names.py
b/sdks/python/apache_beam/runners/dataflow/internal/names.py
index f86306eb276..2075c8eee3f 100644
--- a/sdks/python/apache_beam/runners/dataflow/internal/names.py
+++ b/sdks/python/apache_beam/runners/dataflow/internal/names.py
@@ -30,15 +30,10 @@ SOURCE_FORMAT = 'custom_source'
SOURCE_TYPE = 'CustomSourcesType'
SERIALIZED_SOURCE_KEY = 'serialized_source'
-# In a released SDK, container tags are selected based on the SDK version.
-# Unreleased versions use container versions based on values of
-# BEAM_CONTAINER_VERSION and BEAM_FNAPI_CONTAINER_VERSION (see below).
-
-# Update this version to the next version whenever there is a change that will
-# require changes to legacy Dataflow worker execution environment.
-BEAM_CONTAINER_VERSION = 'beam-master-20230629'
-# Update this version to the next version whenever there is a change that
+# In a released SDK, Python sdk container image is tagged with the SDK version.
+# Unreleased sdks use container image tag specified below.
+# Update this tag whenever there is a change that
# requires changes to SDK harness container or SDK harness launcher.
-BEAM_FNAPI_CONTAINER_VERSION = 'beam-master-20230705'
+BEAM_DEV_SDK_CONTAINER_TAG = 'beam-master-20230717'
DATAFLOW_CONTAINER_IMAGE_REPOSITORY = 'gcr.io/cloud-dataflow/v1beta3'
