From 944d3ee01a9b99641fb9526ec288be27b8d51b8a Mon Sep 17 00:00:00 2001 From: Jack McCluskey Date: Mon, 16 Sep 2024 14:34:24 -0400 Subject: [PATCH 1/4] Update Dataflow internal client test --- .../apache_beam/runners/dataflow/internal/apiclient_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 022136aae9a2c..515ec1376a65d 100644 --- a/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py +++ b/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py @@ -998,12 +998,12 @@ def test_interpreter_version_check_passes_with_experiment(self): @mock.patch( 'apache_beam.runners.dataflow.internal.apiclient.sys.version_info', - (3, 8, 2)) + (3, 12, 2)) @mock.patch( 'apache_beam.runners.dataflow.internal.apiclient.' 'beam_version.__version__', '2.2.0') - def test_interpreter_version_check_passes_py38(self): + def test_interpreter_version_check_passes_py312(self): pipeline_options = PipelineOptions([]) apiclient._verify_interpreter_version_is_supported(pipeline_options) From 19d4f97da53df68247e7feed1c6100af93b2d14d Mon Sep 17 00:00:00 2001 From: Jack McCluskey Date: Mon, 16 Sep 2024 15:05:58 -0400 Subject: [PATCH 2/4] update to python 3.9 --- .../apache_beam/runners/dataflow/internal/apiclient_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 515ec1376a65d..d55739fc68223 100644 --- a/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py +++ b/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py @@ -998,12 +998,12 @@ def test_interpreter_version_check_passes_with_experiment(self): @mock.patch( 'apache_beam.runners.dataflow.internal.apiclient.sys.version_info', - (3, 12, 2)) + (3, 9, 6)) @mock.patch( 'apache_beam.runners.dataflow.internal.apiclient.' 'beam_version.__version__', '2.2.0') - def test_interpreter_version_check_passes_py312(self): + def test_interpreter_version_check_passes_py39(self): pipeline_options = PipelineOptions([]) apiclient._verify_interpreter_version_is_supported(pipeline_options) From 4f19408f461586ab30418e60311190548a98c295 Mon Sep 17 00:00:00 2001 From: Jack McCluskey Date: Mon, 16 Sep 2024 15:36:36 -0400 Subject: [PATCH 3/4] restore 3.8 to versions list --- sdks/python/apache_beam/runners/dataflow/internal/apiclient.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py b/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py index 97996bd6cbb2c..20cae582f320d 100644 --- a/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py +++ b/sdks/python/apache_beam/runners/dataflow/internal/apiclient.py @@ -82,7 +82,7 @@ _LOGGER = logging.getLogger(__name__) -_PYTHON_VERSIONS_SUPPORTED_BY_DATAFLOW = ['3.9', '3.10', '3.11', '3.12'] +_PYTHON_VERSIONS_SUPPORTED_BY_DATAFLOW = ['3.8', '3.9', '3.10', '3.11', '3.12'] class Environment(object): From 17fc2c624ab05e8a26f1c2d6564ab121283e9001 Mon Sep 17 00:00:00 2001 From: Jack McCluskey Date: Mon, 16 Sep 2024 15:54:26 -0400 Subject: [PATCH 4/4] restore unit test --- .../apache_beam/runners/dataflow/internal/apiclient_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d55739fc68223..022136aae9a2c 100644 --- a/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py +++ b/sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py @@ -998,12 +998,12 @@ def test_interpreter_version_check_passes_with_experiment(self): @mock.patch( 'apache_beam.runners.dataflow.internal.apiclient.sys.version_info', - (3, 9, 6)) + (3, 8, 2)) @mock.patch( 'apache_beam.runners.dataflow.internal.apiclient.' 'beam_version.__version__', '2.2.0') - def test_interpreter_version_check_passes_py39(self): + def test_interpreter_version_check_passes_py38(self): pipeline_options = PipelineOptions([]) apiclient._verify_interpreter_version_is_supported(pipeline_options)