You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by pa...@apache.org on 2022/06/16 05:01:10 UTC
[beam] branch master updated: Rollback dill.
This is an automated email from the ASF dual-hosted git repository.
pabloem 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 4c6b6fb6be0 Rollback dill.
new 29f30b36058 Merge pull request #21898 from Rollback dill to 3.1.1
4c6b6fb6be0 is described below
commit 4c6b6fb6be0997a7ff2b674c41eaf16aaf0318de
Author: Valentyn Tymofieiev <va...@google.com>
AuthorDate: Wed Jun 15 11:38:14 2022 -0700
Rollback dill.
---
sdks/python/apache_beam/runners/dataflow/internal/names.py | 4 ++--
sdks/python/container/py37/base_image_requirements.txt | 2 +-
sdks/python/container/py38/base_image_requirements.txt | 2 +-
sdks/python/container/py39/base_image_requirements.txt | 2 +-
sdks/python/setup.py | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sdks/python/apache_beam/runners/dataflow/internal/names.py b/sdks/python/apache_beam/runners/dataflow/internal/names.py
index 7c7e94f38bf..85cd163149b 100644
--- a/sdks/python/apache_beam/runners/dataflow/internal/names.py
+++ b/sdks/python/apache_beam/runners/dataflow/internal/names.py
@@ -36,10 +36,10 @@ SERIALIZED_SOURCE_KEY = 'serialized_source'
# 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-20220609'
+BEAM_CONTAINER_VERSION = 'beam-master-20220512'
# Update this version to the next version whenever there is a change that
# requires changes to SDK harness container or SDK harness launcher.
-BEAM_FNAPI_CONTAINER_VERSION = 'beam-master-20220609'
+BEAM_FNAPI_CONTAINER_VERSION = 'beam-master-20220512'
DATAFLOW_CONTAINER_IMAGE_REPOSITORY = 'gcr.io/cloud-dataflow/v1beta3'
diff --git a/sdks/python/container/py37/base_image_requirements.txt b/sdks/python/container/py37/base_image_requirements.txt
index f36accc7b18..b88cd178ea1 100644
--- a/sdks/python/container/py37/base_image_requirements.txt
+++ b/sdks/python/container/py37/base_image_requirements.txt
@@ -38,7 +38,7 @@ crcmod==1.7
cryptography==37.0.2
Cython==0.29.28
deprecation==2.1.0
-dill==0.3.5.1
+dill==0.3.1.1
docker==5.0.3
docopt==0.6.2
execnet==1.9.0
diff --git a/sdks/python/container/py38/base_image_requirements.txt b/sdks/python/container/py38/base_image_requirements.txt
index 2e0a2a585f5..b6f57c9e66e 100644
--- a/sdks/python/container/py38/base_image_requirements.txt
+++ b/sdks/python/container/py38/base_image_requirements.txt
@@ -37,7 +37,7 @@ crcmod==1.7
cryptography==37.0.2
Cython==0.29.28
deprecation==2.1.0
-dill==0.3.5.1
+dill==0.3.1.1
docker==5.0.3
docopt==0.6.2
execnet==1.9.0
diff --git a/sdks/python/container/py39/base_image_requirements.txt b/sdks/python/container/py39/base_image_requirements.txt
index 11dd7e7e217..5542d5e36c9 100644
--- a/sdks/python/container/py39/base_image_requirements.txt
+++ b/sdks/python/container/py39/base_image_requirements.txt
@@ -37,7 +37,7 @@ crcmod==1.7
cryptography==37.0.2
Cython==0.29.28
deprecation==2.1.0
-dill==0.3.5.1
+dill==0.3.1.1
docker==5.0.3
docopt==0.6.2
execnet==1.9.0
diff --git a/sdks/python/setup.py b/sdks/python/setup.py
index 32ed047a12b..46a069df214 100644
--- a/sdks/python/setup.py
+++ b/sdks/python/setup.py
@@ -211,7 +211,7 @@ if __name__ == '__main__':
# using older version of dill. It is best to use the same version of
# dill on client and server, therefore list of allowed versions is very
# narrow. See: https://github.com/uqfoundation/dill/issues/341.
- 'dill>=0.3.5.1,<0.3.6',
+ 'dill>=0.3.1.1,<0.3.2',
'cloudpickle>=2.1.0,<3',
'fastavro>=0.23.6,<2',
'grpcio>=1.33.1,<2',