From 9faf928741fe2eac93c5b932a0aa354786238cc2 Mon Sep 17 00:00:00 2001 From: Jack McCluskey <34928439+jrmccluskey@users.noreply.github.com> Date: Wed, 18 Sep 2024 12:34:07 -0400 Subject: [PATCH] Restore release-essential references to 3.8 (#32499) --- .github/workflows/beam_Publish_Beam_SDK_Snapshots.yml | 1 + .github/workflows/build_wheels.yml | 4 ++-- .github/workflows/update_python_dependencies.yml | 1 + .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 1 + gradle.properties | 2 +- local-env-setup.sh | 4 ++-- release/src/main/Dockerfile | 3 ++- release/src/main/python-release/python_release_automation.sh | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml b/.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml index c971ef36a081..72de1f15229f 100644 --- a/.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml +++ b/.github/workflows/beam_Publish_Beam_SDK_Snapshots.yml @@ -66,6 +66,7 @@ jobs: - "java:container:java11" - "java:container:java17" - "java:container:java21" + - "python:container:py38" - "python:container:py39" - "python:container:py310" - "python:container:py311" diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index a2283ceb6e97..25030231a5e8 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -49,7 +49,7 @@ jobs: env: EVENT_NAME: ${{ github.event_name }} # Keep in sync with py_version matrix value below - if changed, change that as well. - PY_VERSIONS_FULL: "cp39-* cp310-* cp311-* cp312-*" + PY_VERSIONS_FULL: "cp38-* cp39-* cp310-* cp311-* cp312-*" outputs: gcp-variables-set: ${{ steps.check_gcp_variables.outputs.gcp-variables-set }} py-versions-full: ${{ steps.set-py-versions.outputs.py-versions-full }} @@ -230,7 +230,7 @@ jobs: {"os": "ubuntu-20.04", "runner": [self-hosted, ubuntu-20.04, main], "python": "${{ needs.check_env_variables.outputs.py-versions-test }}", arch: "aarch64" } ] # Keep in sync with PY_VERSIONS_FULL env var abvove - if changed, change that as well. - py_version: ["cp39-*", "cp310-*", "cp311-*", "cp312-*"] + py_version: ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*"] steps: - name: Download python source distribution from artifacts # Pinned to v3 because of https://github.com/actions/download-artifact/issues/249 diff --git a/.github/workflows/update_python_dependencies.yml b/.github/workflows/update_python_dependencies.yml index 0ab52e97b9f0..a91aff39f29a 100644 --- a/.github/workflows/update_python_dependencies.yml +++ b/.github/workflows/update_python_dependencies.yml @@ -56,6 +56,7 @@ jobs: uses: ./.github/actions/setup-environment-action with: python-version: | + 3.8 3.9 3.10 3.11 diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index 4aec3a796f27..a334cf3191f2 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -3145,6 +3145,7 @@ class BeamModulePlugin implements Plugin { mustRunAfter = [ ":runners:flink:${project.ext.latestFlinkVersion}:job-server:shadowJar", ':runners:spark:3:job-server:shadowJar', + ':sdks:python:container:py38:docker', ':sdks:python:container:py39:docker', ':sdks:python:container:py310:docker', ':sdks:python:container:py311:docker', diff --git a/gradle.properties b/gradle.properties index 20a478cd6aab..084d7d8999b3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -41,4 +41,4 @@ docker_image_default_repo_prefix=beam_ # supported flink versions flink_versions=1.15,1.16,1.17,1.18 # supported python versions -python_versions=3.9,3.10,3.11,3.12 +python_versions=3.8,3.9,3.10,3.11,3.12 diff --git a/local-env-setup.sh b/local-env-setup.sh index ba30813b2bcc..f13dc88432a6 100755 --- a/local-env-setup.sh +++ b/local-env-setup.sh @@ -55,7 +55,7 @@ if [ "$kernelname" = "Linux" ]; then exit fi - for ver in 3.9 3.10 3.11 3.12 3; do + for ver in 3.8 3.9 3.10 3.11 3.12 3; do apt install --yes python$ver-venv done @@ -89,7 +89,7 @@ elif [ "$kernelname" = "Darwin" ]; then echo "Installing openjdk@8" brew install openjdk@8 fi - for ver in 3.9 3.10 3.11 3.12; do + for ver in 3.8 3.9 3.10 3.11 3.12; do if brew ls --versions python@$ver > /dev/null; then echo "python@$ver already installed. Skipping" brew info python@$ver diff --git a/release/src/main/Dockerfile b/release/src/main/Dockerfile index 8d0f2229adfa..8f981fddfcd8 100644 --- a/release/src/main/Dockerfile +++ b/release/src/main/Dockerfile @@ -42,11 +42,12 @@ RUN curl https://pyenv.run | bash && \ echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"' >> /root/.bashrc && \ echo ''eval "$(pyenv init -)"'' >> /root/.bashrc && \ source /root/.bashrc && \ + pyenv install 3.8.9 && \ pyenv install 3.9.4 && \ pyenv install 3.10.7 && \ pyenv install 3.11.3 && \ pyenv install 3.12.3 && \ - pyenv global 3.9.4 3.10.7 3.11.3 3.12.3 + pyenv global 3.8.9 3.9.4 3.10.7 3.11.3 3.12.3 # Install a Go version >= 1.16 so we can bootstrap higher # Go versions diff --git a/release/src/main/python-release/python_release_automation.sh b/release/src/main/python-release/python_release_automation.sh index 248bdd9b65ac..2f6986885a96 100755 --- a/release/src/main/python-release/python_release_automation.sh +++ b/release/src/main/python-release/python_release_automation.sh @@ -19,7 +19,7 @@ source release/src/main/python-release/run_release_candidate_python_quickstart.sh source release/src/main/python-release/run_release_candidate_python_mobile_gaming.sh -for version in 3.9 3.10 3.11 3.12 +for version in 3.8 3.9 3.10 3.11 3.12 do run_release_candidate_python_quickstart "tar" "python${version}" run_release_candidate_python_mobile_gaming "tar" "python${version}"