Merge pull request apache#30828 - Add Python 3.12 support

je-ik · May 23, 2024 · dc6b72c · dc6b72c
2 parents 1f63196 + ab460c1
commit dc6b72c
Show file tree

Hide file tree

Showing 54 changed files with 216 additions and 95 deletions.
diff --git a/.github/workflows/beam_PostCommit_Python.yml b/.github/workflows/beam_PostCommit_Python.yml
@@ -60,7 +60,7 @@ jobs:
       matrix:
         job_name: [beam_PostCommit_Python]
         job_phrase: [Run Python PostCommit]
-        python_version: ['3.8', '3.9', '3.10', '3.11']
+        python_version: ['3.8', '3.9', '3.10', '3.11', '3.12']
     if: |
       github.event_name == 'workflow_dispatch' ||
       github.event_name == 'pull_request_target' ||

diff --git a/.github/workflows/beam_PostCommit_Python_Arm.yml b/.github/workflows/beam_PostCommit_Python_Arm.yml
@@ -62,7 +62,7 @@ jobs:
       matrix:
         job_name: [beam_PostCommit_Python_Arm]
         job_phrase: [Run Python PostCommit Arm]
-        python_version: ['3.8', '3.9', '3.10', '3.11']
+        python_version: ['3.8', '3.9', '3.10', '3.11', '3.12']
     if: |
       github.event_name == 'workflow_dispatch' ||
       github.event_name == 'pull_request_target' ||

diff --git a/.github/workflows/beam_PostCommit_Python_Examples_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_Examples_Dataflow.yml
@@ -74,14 +74,14 @@ jobs:
         uses: ./.github/actions/setup-environment-action
         with:
           java-version: default
-          python-version: 3.11
+          python-version: 3.12
       - name: Run examplesPostCommit script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
           gradle-command: :sdks:python:test-suites:dataflow:examplesPostCommit
           arguments: |
             -PuseWheelDistribution \
-            -PpythonVersion=3.11 \
+            -PpythonVersion=3.12 \
       - name: Archive Python Test Results
         uses: actions/upload-artifact@v4
         if: failure()

diff --git a/.github/workflows/beam_PostCommit_Python_Examples_Direct.yml b/.github/workflows/beam_PostCommit_Python_Examples_Direct.yml
@@ -63,7 +63,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_Python_Examples_Direct"]
         job_phrase: ["Run Python Examples_Direct"]
-        python_version: ['3.8','3.9','3.10','3.11']
+        python_version: ['3.8','3.9','3.10','3.11','3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository

diff --git a/.github/workflows/beam_PostCommit_Python_Examples_Flink.yml b/.github/workflows/beam_PostCommit_Python_Examples_Flink.yml
@@ -63,7 +63,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_Python_Examples_Flink"]
         job_phrase: ["Run Python Examples_Flink"]
-        python_version: ['3.8', '3.11']
+        python_version: ['3.8', '3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository

diff --git a/.github/workflows/beam_PostCommit_Python_Examples_Spark.yml b/.github/workflows/beam_PostCommit_Python_Examples_Spark.yml
@@ -63,7 +63,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_Python_Examples_Spark"]
         job_phrase: ["Run Python Examples_Spark"]
-        python_version: ['3.8', '3.11']
+        python_version: ['3.8', '3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository

diff --git a/.github/workflows/beam_PostCommit_Python_MongoDBIO_IT.yml b/.github/workflows/beam_PostCommit_Python_MongoDBIO_IT.yml
@@ -74,13 +74,13 @@ jobs:
         uses: ./.github/actions/setup-environment-action
         with:
           java-version: default
-          python-version: 3.11
+          python-version: 3.12
       - name: Run mongodbioIT script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
-          gradle-command: :sdks:python:test-suites:direct:py311:mongodbioIT
+          gradle-command: :sdks:python:test-suites:direct:py312:mongodbioIT
           arguments: |
-            -PpythonVersion=3.11 \
+            -PpythonVersion=3.12 \
       - name: Archive Python Test Results
         uses: actions/upload-artifact@v4
         if: failure()

diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml
@@ -65,7 +65,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_Python_ValidatesContainer_Dataflow"]
         job_phrase: ["Run Python Dataflow ValidatesContainer"]
-        python_version: ['3.8','3.9','3.10','3.11']
+        python_version: ['3.8','3.9','3.10','3.11','3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository

diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml
@@ -63,7 +63,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC"]
         job_phrase: ["Run Python RC Dataflow ValidatesContainer"]
-        python_version: ['3.8','3.9','3.10','3.11']
+        python_version: ['3.8','3.9','3.10','3.11','3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository

diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesRunner_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_ValidatesRunner_Dataflow.yml
@@ -63,7 +63,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_Python_ValidatesRunner_Dataflow"]
         job_phrase: ["Run Python Dataflow ValidatesRunner"]
-        python_version: ['3.8', '3.11']
+        python_version: ['3.8', '3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository

diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesRunner_Flink.yml b/.github/workflows/beam_PostCommit_Python_ValidatesRunner_Flink.yml
@@ -63,7 +63,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_Python_ValidatesRunner_Flink"]
         job_phrase: ["Run Python Flink ValidatesRunner"]
-        python_version: ['3.8', '3.11']
+        python_version: ['3.8', '3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository

diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesRunner_Samza.yml b/.github/workflows/beam_PostCommit_Python_ValidatesRunner_Samza.yml
@@ -63,7 +63,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_Python_ValidatesRunner_Samza"]
         job_phrase: ["Run Python Samza ValidatesRunner"]
-        python_version: ['3.8', '3.11']
+        python_version: ['3.8', '3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository

diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesRunner_Spark.yml b/.github/workflows/beam_PostCommit_Python_ValidatesRunner_Spark.yml
@@ -63,7 +63,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_Python_ValidatesRunner_Spark"]
         job_phrase: ["Run Python Spark ValidatesRunner"]
-        python_version: ['3.8', '3.9', '3.11']
+        python_version: ['3.8', '3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository

diff --git a/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Dataflow.yml
@@ -75,7 +75,7 @@ jobs:
         with:
           python-version: |
             3.8
-            3.11
+            3.12
       - name: run PostCommit Python Xlang Gcp Dataflow script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:

diff --git a/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Direct.yml b/.github/workflows/beam_PostCommit_Python_Xlang_Gcp_Direct.yml
@@ -75,7 +75,7 @@ jobs:
         with:
           python-version: |
             3.8
-            3.11
+            3.12
       - name: run PostCommit Python Xlang Gcp Direct script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:

diff --git a/.github/workflows/beam_PostCommit_Python_Xlang_IO_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_Xlang_IO_Dataflow.yml
@@ -75,7 +75,7 @@ jobs:
         with:
           python-version: |
             3.8
-            3.11
+            3.12
       - name: run PostCommit Python Xlang IO Dataflow script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:

diff --git a/.github/workflows/beam_PostCommit_Sickbay_Python.yml b/.github/workflows/beam_PostCommit_Sickbay_Python.yml
@@ -61,7 +61,7 @@ jobs:
         job_name: [beam_PostCommit_Sickbay_Python]
         job_phrase_1: [Run Python]
         job_phrase_2: [PostCommit Sickbay]
-        python_version: ['3.8', '3.9', '3.10', '3.11']
+        python_version: ['3.8', '3.9', '3.10', '3.11', '3.12']
     if: |
       github.event_name == 'workflow_dispatch' ||
       github.event_name == 'pull_request_target' ||

diff --git a/.github/workflows/beam_PostCommit_TransformService_Direct.yml b/.github/workflows/beam_PostCommit_TransformService_Direct.yml
@@ -62,7 +62,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_TransformService_Direct"]
         job_phrase: ["Run TransformService_Direct PostCommit"]
-        python_version: ['3.8','3.11']
+        python_version: ['3.8','3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository
@@ -77,7 +77,7 @@ jobs:
           java-version: 11
           python-version: |
             3.8
-            3.11
+            ${{ matrix.python_version }}
       - name: run TransformService Direct script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:

diff --git a/.github/workflows/beam_PostCommit_XVR_Direct.yml b/.github/workflows/beam_PostCommit_XVR_Direct.yml
@@ -62,7 +62,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_XVR_Direct"]
         job_phrase: ["Run XVR_Direct PostCommit"]
-        python_version: ['3.8','3.11']
+        python_version: ['3.8','3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository
@@ -76,7 +76,7 @@ jobs:
         with:
           python-version: |
             3.8
-            3.11
+            ${{ matrix.python_version }}
       - name: run PostCommit XVR Direct script
         env:
           CLOUDSDK_CONFIG: ${{ env.KUBELET_GCLOUD_CONFIG_PATH}}

diff --git a/.github/workflows/beam_PostCommit_XVR_Flink.yml b/.github/workflows/beam_PostCommit_XVR_Flink.yml
@@ -63,7 +63,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_XVR_Flink"]
         job_phrase: ["Run XVR_Flink PostCommit"]
-        python_version: ['3.8','3.11']
+        python_version: ['3.8','3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository
@@ -77,7 +77,7 @@ jobs:
         with:
           python-version: |
             3.8
-            3.11
+            ${{ matrix.python_version }}
       - name: run PostCommit XVR Flink script
         env:
           CLOUDSDK_CONFIG: ${{ env.KUBELET_GCLOUD_CONFIG_PATH}}

diff --git a/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_JavaUsingPython_Dataflow.yml
@@ -62,7 +62,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_XVR_JavaUsingPython_Dataflow"]
         job_phrase: ["Run XVR_JavaUsingPython_Dataflow PostCommit"]
-        python_version: ['3.8','3.11']
+        python_version: ['3.8','3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository
@@ -76,7 +76,7 @@ jobs:
         with:
           python-version: |
             3.8
-            3.11
+            ${{ matrix.python_version }}
       - name: run PostCommit XVR JavaUsingPython Dataflow script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:

diff --git a/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_PythonUsingJavaSQL_Dataflow.yml
@@ -73,13 +73,13 @@ jobs:
       - name: Setup environment
         uses: ./.github/actions/setup-environment-action
         with:
-          python-version: 3.11
+          python-version: 3.12
       - name: run PostCommit XVR PythonUsingJavaSQL Dataflow script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
           gradle-command: :runners:google-cloud-dataflow-java:validatesCrossLanguageRunnerPythonUsingSql
           arguments: |
-            -PpythonVersion=3.11 \
+            -PpythonVersion=3.12 \
       - name: Archive Python Test Results
         uses: actions/upload-artifact@v4
         if: failure()

diff --git a/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml b/.github/workflows/beam_PostCommit_XVR_PythonUsingJava_Dataflow.yml
@@ -62,7 +62,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_XVR_PythonUsingJava_Dataflow"]
         job_phrase: ["Run XVR_PythonUsingJava_Dataflow PostCommit"]
-        python_version: ['3.8','3.11']
+        python_version: ['3.8','3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository
@@ -76,7 +76,7 @@ jobs:
         with:
           python-version: |
             3.8
-            3.11
+            ${{ matrix.python_version }}
       - name: run PostCommit XVR PythonUsingJava Dataflow script
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:

diff --git a/.github/workflows/beam_PostCommit_XVR_Samza.yml b/.github/workflows/beam_PostCommit_XVR_Samza.yml
@@ -62,7 +62,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_XVR_Samza"]
         job_phrase: ["Run XVR_Samza PostCommit"]
-        python_version: ['3.8','3.11']
+        python_version: ['3.8','3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository
@@ -76,7 +76,7 @@ jobs:
         with:
           python-version: |
             3.8
-            3.11
+            ${{ matrix.python_version }}
       - name: run PostCommit XVR Samza script
         env:
           CLOUDSDK_CONFIG: ${{ env.KUBELET_GCLOUD_CONFIG_PATH}}

diff --git a/.github/workflows/beam_PostCommit_XVR_Spark3.yml b/.github/workflows/beam_PostCommit_XVR_Spark3.yml
@@ -62,7 +62,7 @@ jobs:
       matrix:
         job_name: ["beam_PostCommit_XVR_Spark3"]
         job_phrase: ["Run XVR_Spark3 PostCommit"]
-        python_version: ['3.8','3.11']
+        python_version: ['3.8','3.12']
     steps:
       - uses: actions/checkout@v4
       - name: Setup repository
@@ -76,7 +76,7 @@ jobs:
         with:
           python-version: |
             3.8
-            3.11
+            ${{ matrix.python_version }}
       - name: run PostCommit XVR Spark3 script
         env:
           CLOUDSDK_CONFIG: ${{ env.KUBELET_GCLOUD_CONFIG_PATH}}

diff --git a/.github/workflows/beam_PreCommit_Portable_Python.yml b/.github/workflows/beam_PreCommit_Portable_Python.yml
@@ -86,7 +86,7 @@ jobs:
       matrix:
         job_name: ['beam_PreCommit_Portable_Python']
         job_phrase: ['Run Portable_Python PreCommit']
-        python_version: ['3.8', '3.11']
+        python_version: ['3.8', '3.12']
     if: |
       github.event_name == 'push' ||
       github.event_name == 'pull_request_target' ||

diff --git a/.github/workflows/beam_PreCommit_Python.yml b/.github/workflows/beam_PreCommit_Python.yml
@@ -64,7 +64,7 @@ jobs:
       matrix:
         job_name: ['beam_PreCommit_Python']
         job_phrase: ['Run Python PreCommit']
-        python_version: ['3.8','3.9','3.10','3.11']
+        python_version: ['3.8','3.9','3.10','3.11','3.12']
     if: |
       github.event_name == 'push' ||
       github.event_name == 'pull_request_target' ||

diff --git a/.github/workflows/beam_PreCommit_PythonDocker.yml b/.github/workflows/beam_PreCommit_PythonDocker.yml
@@ -64,9 +64,9 @@ jobs:
       matrix:
         job_name: ["beam_PreCommit_PythonDocker"]
         job_phrase: ["Run PythonDocker PreCommit"]
-        python_version: ['3.8','3.9','3.10','3.11']
+        python_version: ['3.8','3.9','3.10','3.11','3.12']
     if: |
-      github.event_name == 'push' || 
+      github.event_name == 'push' ||
       github.event_name == 'pull_request_target' ||
       github.event_name == 'workflow_dispatch' ||
       (github.event_name == 'schedule' && github.repository == 'apache/beam') ||

diff --git a/.github/workflows/beam_PreCommit_Python_Dataframes.yml b/.github/workflows/beam_PreCommit_Python_Dataframes.yml
@@ -64,7 +64,7 @@ jobs:
       matrix:
         job_name: ['beam_PreCommit_Python_Dataframes']
         job_phrase: ['Run Python_Dataframes PreCommit']
-        python_version: ['3.8','3.9','3.10','3.11']
+        python_version: ['3.8','3.9','3.10','3.11','3.12']
     if: |
       github.event_name == 'push' ||
       github.event_name == 'pull_request_target' ||

diff --git a/.github/workflows/beam_PreCommit_Python_Examples.yml b/.github/workflows/beam_PreCommit_Python_Examples.yml
@@ -64,7 +64,7 @@ jobs:
       matrix:
         job_name: ['beam_PreCommit_Python_Examples']
         job_phrase: ['Run Python_Examples PreCommit']
-        python_version: ['3.8','3.9','3.10','3.11']
+        python_version: ['3.8','3.9','3.10','3.11','3.12']
     if: |
       github.event_name == 'push' ||
       github.event_name == 'pull_request_target' ||

diff --git a/.github/workflows/beam_PreCommit_Python_Integration.yml b/.github/workflows/beam_PreCommit_Python_Integration.yml
@@ -64,7 +64,7 @@ jobs:
       matrix:
         job_name: ['beam_PreCommit_Python_Integration']
         job_phrase: ['Run Python_Integration PreCommit']
-        python_version: ['3.8', '3.11']
+        python_version: ['3.8', '3.12']
     if: |
       github.event_name == 'push' ||
       github.event_name == 'pull_request_target' ||

diff --git a/.github/workflows/beam_PreCommit_Python_ML.yml b/.github/workflows/beam_PreCommit_Python_ML.yml
@@ -64,7 +64,7 @@ jobs:
       matrix:
         job_name: ['beam_PreCommit_Python_ML']
         job_phrase: ['Run Python_ML PreCommit']
-        python_version: ['3.8','3.9','3.10','3.11']
+        python_version: ['3.8','3.9','3.10','3.11','3.12']
     if: |
       github.event_name == 'push' ||
       github.event_name == 'pull_request_target' ||
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,7 +75,7 @@ jobs: @@
             with:
               python-version: |
 .8
-.11
+.12
           - name: run PostCommit Python Xlang Gcp Dataflow script
             uses: ./.github/actions/gradle-command-self-hosted-action
             with:
@@ Expand Down @@