[BEAM-9372][BEAM-7372] Clean release script and correct naming pattern for 3.8 and newer wheels.

Author: tvalentyn

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 2.7 3.5 3.6 3.7 3.8
+for version in 3.6 3.7 3.8
 do
   run_release_candidate_python_quickstart    "tar"   "python${version}"
   run_release_candidate_python_mobile_gaming "tar"   "python${version}"

release/src/main/python-release/python_release_automation_utils.sh

@@ -78,22 +78,18 @@ function get_version() {
 #   BEAM_PYTHON_SDK*
 # Arguments:
 #   $1 - SDK type: tar, wheel
-#   $2 - python interpreter version: python2.7, python3.5, ...
+#   $2 - python interpreter version: python3.7, python3.8, ...
 #######################################
 function download_files() {
   if [[ $1 = *"wheel"* ]]; then
-    if [[ $2 == "python2.7" ]]; then
-      BEAM_PYTHON_SDK_WHL="apache_beam-$VERSION*-cp27-cp27mu-manylinux1_x86_64.whl"
-    elif [[ $2 == "python3.5" ]]; then
-      BEAM_PYTHON_SDK_WHL="apache_beam-$VERSION*-cp35-cp35m-manylinux1_x86_64.whl"
-    elif [[ $2 == "python3.6" ]]; then
+    if [[ $2 == "python3.6" ]]; then
       BEAM_PYTHON_SDK_WHL="apache_beam-$VERSION*-cp36-cp36m-manylinux1_x86_64.whl"
     elif [[ $2 == "python3.7" ]]; then
       BEAM_PYTHON_SDK_WHL="apache_beam-$VERSION*-cp37-cp37m-manylinux1_x86_64.whl"
     elif [[ $2 == "python3.8" ]]; then
-      BEAM_PYTHON_SDK_WHL="apache_beam-$VERSION*-cp38-cp38m-manylinux1_x86_64.whl"
+      BEAM_PYTHON_SDK_WHL="apache_beam-$VERSION*-cp38-cp38-manylinux1_x86_64.whl"
     elif [[ $2 == "python3.9" ]]; then
-      BEAM_PYTHON_SDK_WHL="apache_beam-$VERSION*-cp39-cp39m-manylinux1_x86_64.whl"
+      BEAM_PYTHON_SDK_WHL="apache_beam-$VERSION*-cp39-cp39-manylinux1_x86_64.whl"
     else
       echo "Unable to determine a Beam wheel for interpreter version $2."
       exit 1
@@ -157,7 +153,7 @@ function get_asc_name() {
 #   BEAM_PYTHON_SDK
 # Arguments:
 #   $1 - SDK type: tar, wheel
-#   $2 - python interpreter version: [python2.7, python3.5, ...]
+#   $2 - python interpreter version: [python3.7, python3.8, ...]
 #######################################
 function install_sdk() {
   sdk_file=$(get_sdk_name $1)

release/src/main/python-release/run_release_candidate_python_mobile_gaming.sh

@@ -147,7 +147,7 @@ function verify_hourlyteamscore_dataflow() {
 #   VERSION
 # Arguments:
 #   $1 - sdk types: [tar, wheel]
-#   $2 - python interpreter version: [python2.7, python3.5, ...]
+#   $2 - python interpreter version: [python3.7, python3.8, ...]
 #######################################
 function run_release_candidate_python_mobile_gaming() {
   print_separator "Start Mobile Gaming Examples"

release/src/main/python-release/run_release_candidate_python_quickstart.sh

@@ -215,7 +215,7 @@ function verify_streaming_wordcount_dataflow() {
 #   VERSION
 # Arguments:
 #   $1 - sdk types: [tar, wheel]
-#   $2 - python interpreter version: [python2.7, python3.5, ...]
+#   $2 - python interpreter version: [python3.7, python3.8, ...]
 #######################################
 function run_release_candidate_python_quickstart(){
   print_separator "Start Quickstarts Examples"

release/src/main/scripts/build_release_candidate.sh

@@ -49,7 +49,7 @@ WEBSITE_ROOT_DIR=beam-site
 DOCKER_IMAGE_DEFAULT_REPO_ROOT=apache
 DOCKER_IMAGE_DEFAULT_REPO_PREFIX=beam_
 
-PYTHON_VER=("python2.7" "python3.5" "python3.6" "python3.7" "python3.8")
+PYTHON_VER=("python3.6" "python3.7" "python3.8")
 FLINK_VER=("1.8" "1.9" "1.10")
 
 echo "================Setting Up Environment Variables==========="

release/src/main/scripts/download_github_actions_artifacts.py

@@ -110,7 +110,7 @@ def get_yes_or_no_answer(question):
   elif reply == "n":
     return False
   else:
-    return get_yes_or_no_answer("Uhhhh... please enter")
+    return get_yes_or_no_answer("Please enter")
 
 
 def get_build_wheels_workflow_id(repo_url, github_token):

release/src/main/scripts/mass_comment.py

@@ -41,10 +41,8 @@
     "Run Python Spark ValidatesRunner",
     "Run Python Dataflow ValidatesContainer",
     "Run Python Dataflow ValidatesRunner",
-    "Run Python 3.5 Flink ValidatesRunner",
+    "Run Python Flink ValidatesRunner",
     "Run Twister2 ValidatesRunner",
-    "Run Python 2 PostCommit",
-    "Run Python 3.5 PostCommit",
     "Run Python 3.6 PostCommit",
     "Run Python 3.7 PostCommit",
     "Run Python 3.8 PostCommit",
@@ -56,7 +54,10 @@
     "Run Portable_Python PreCommit",
     "Run PythonLint PreCommit",
     "Run Python PreCommit",
-    "Run Python DockerBuild PreCommit"
+    "Run Python DockerBuild PreCommit",
+    "Run XVR_Direct PostCommit",
+    "Run XVR_Flink PostCommit",
+    "Run XVR_Spark PostCommit",
 ]
 
 

release/src/main/scripts/publish_docker_images.sh

@@ -27,7 +27,7 @@ set -e
 DOCKER_IMAGE_DEFAULT_REPO_ROOT=apache
 DOCKER_IMAGE_DEFAULT_REPO_PREFIX=beam_
 
-PYTHON_VER=("python2.7" "python3.5" "python3.6" "python3.7" "python3.8")
+PYTHON_VER=("python3.6" "python3.7" "python3.8")
 FLINK_VER=("1.8" "1.9" "1.10")
 
 echo "Publish SDK docker images to Docker Hub."

release/src/main/scripts/run_rc_validation.sh

@@ -66,7 +66,7 @@ HUB_VERSION=2.12.0
 HUB_ARTIFACTS_NAME=hub-linux-amd64-${HUB_VERSION}
 BACKUP_BASHRC=.bashrc_backup_$(date +"%Y%m%d%H%M%S")
 BACKUP_M2=settings_backup_$(date +"%Y%m%d%H%M%S").xml
-declare -a PYTHON_VERSIONS_TO_VALIDATE=("python2.7" "python3.5")
+declare -a PYTHON_VERSIONS_TO_VALIDATE=("python3.6" "python3.8")
 
 echo ""
 echo "====================Checking Environment & Variables================="