ODP-2718: Use ambari-python-wrap instead of python (#5)

JeffreySmith · dishtikundra · harshith-212 · web-flow · commit 4c4f7719553f · 2025-01-13T11:32:31.000-05:00
* ODP-2781: Refactor kudu to use ambari-python-wrap

* ODP-2781 Suspected ambari-python-wrap refractor changes

* ODP-2781 : Possibly needed refactoring for ambari-wrap

* ODP-2781: Additional ambari-python-wrap changes

* ODP-2718: Set PYTHON_EXECUTABLE to ambari-python-wrap, if found

---------

Co-authored-by: dishtikundra &lt;dishti@acceldata.io&gt;
Co-authored-by: harshith gandhe &lt;harshith@acceldata.io&gt;
diff --git a/build-support/build_source_release.py b/build-support/build_source_release.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/build-support/check_compatibility.py b/build-support/check_compatibility.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/build-support/clang_tidy_gerrit.py b/build-support/clang_tidy_gerrit.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/build-support/dep_extract.py b/build-support/dep_extract.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/build-support/dist_test.py b/build-support/dist_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/build-support/gen_version_info.py b/build-support/gen_version_info.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/build-support/iwyu.py b/build-support/iwyu.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/build-support/iwyu/fix_includes.py b/build-support/iwyu/fix_includes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 
 ##===--- fix_includes.py - rewrite source files based on iwyu output ------===##
 #
diff --git a/build-support/iwyu/iwyu_tool.py b/build-support/iwyu/iwyu_tool.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 
 # This file has been imported into the Kudu source tree from
 # the IWYU source tree as of version 0.8
diff --git a/build-support/kudu_util.py b/build-support/kudu_util.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/build-support/mini-cluster/relocate_binaries_for_mini_cluster.py b/build-support/mini-cluster/relocate_binaries_for_mini_cluster.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 ################################################################################
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/build-support/parse_test_failure.py b/build-support/parse_test_failure.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/build-support/push_to_asf.py b/build-support/push_to_asf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/build-support/release/check-rat-report.py b/build-support/release/check-rat-report.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env ambari-python-wrap
 ##############################################################################
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/build-support/run_dist_test.py b/build-support/run_dist_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/build-support/test_result_server.py b/build-support/test_result_server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/docker/bootstrap-python-env.sh b/docker/bootstrap-python-env.sh
@@ -27,7 +27,7 @@ set -xe
 set -o pipefail
 
 function install_python_packages() {
-  PYTHON_VERSION=$(python --version 2>&1 | cut -d' ' -f2)
+  PYTHON_VERSION=$(ambari-python-wrap --version 2>&1 | cut -d' ' -f2)
   PYTHON_MAJOR=$(echo "$PYTHON_VERSION" | cut -d'.' -f1)
   PYTHON_MINOR=$(echo "$PYTHON_VERSION" | cut -d'.' -f2)
 
@@ -37,12 +37,12 @@ function install_python_packages() {
   if [[ "$PYTHON_MAJOR" == "2" && "$PYTHON_MINOR" == "7" ]]; then
     # The standard get-pip.py URL no longer supports Python 2.7,
     # so we need to use the version specific one.
-    curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | python
+    curl https://bootstrap.pypa.io/pip/2.7/get-pip.py | ambari-python-wrap
   else
     # Use a stable version of pip that works with Python 2 and 3.
-    curl https://bootstrap.pypa.io/get-pip.py | python - "pip < 20.3.4"
+    curl https://bootstrap.pypa.io/get-pip.py | ambari-python-wrap - "pip < 20.3.4"
   fi
-  pip install --upgrade \
+  ambari-python-wrap -m pip install --upgrade \
     cython \
     setuptools \
     setuptools_scm
diff --git a/docker/docker-build.py b/docker/docker-build.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 ##########################################################
 #
 # Licensed to the Apache Software Foundation (ASF) under one
diff --git a/ext/ranger/scripts/ranger_credential_helper.py b/ext/ranger/scripts/ranger_credential_helper.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env ambari-python-wrap
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
diff --git a/python/setup.py b/python/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 
 #
 # Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/kudu/benchmarks/wal_hiccup-parser.py b/src/kudu/benchmarks/wal_hiccup-parser.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/src/kudu/experiments/merge-test.py b/src/kudu/experiments/merge-test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/src/kudu/scripts/assign-location.py b/src/kudu/scripts/assign-location.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/src/kudu/scripts/backup-perf.py b/src/kudu/scripts/backup-perf.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/src/kudu/scripts/benchmarks.sh b/src/kudu/scripts/benchmarks.sh
@@ -145,7 +145,7 @@ record_result() {
   local ITER=$3
   local VALUE=$4
   if [ $BENCHMARK_MODE = $MODE_JENKINS ]; then
-    python write-jobs-stats-to-mysql.py $JOB_NAME $BUILD_IDENTIFIER $TEST_NAME $ITER $VALUE
+    ambari-python-wrap write-jobs-stats-to-mysql.py $JOB_NAME $BUILD_IDENTIFIER $TEST_NAME $ITER $VALUE
   else
     local STATS_FILE="$OUTDIR/$LOCAL_STATS_BASE-$TEST_NAME.tsv"
     # Note: literal tabs in below string.
@@ -156,7 +156,7 @@ record_result() {
 load_stats() {
   local TEST_NAME="$1"
   if [ "$BENCHMARK_MODE" = "$MODE_JENKINS" ]; then
-    python get-job-stats-from-mysql.py $TEST_NAME $STATS_DAYS_TO_FETCH
+    ambari-python-wrap get-job-stats-from-mysql.py $TEST_NAME $STATS_DAYS_TO_FETCH
   else
     # Convert MySQL wildcards to shell wildcards.
     local TEST_NAME=$(echo $TEST_NAME | perl -pe 's/%/*/g')
diff --git a/src/kudu/scripts/convert-hybrid-timestamp.py b/src/kudu/scripts/convert-hybrid-timestamp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/src/kudu/scripts/dump_breakpad_symbols.py b/src/kudu/scripts/dump_breakpad_symbols.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/src/kudu/scripts/get-job-stats-from-mysql.py b/src/kudu/scripts/get-job-stats-from-mysql.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/src/kudu/scripts/graph-metrics.py b/src/kudu/scripts/graph-metrics.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/src/kudu/scripts/max_skew_estimate.py b/src/kudu/scripts/max_skew_estimate.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/src/kudu/scripts/parse_metrics_log.py b/src/kudu/scripts/parse_metrics_log.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/src/kudu/scripts/tpch.sh b/src/kudu/scripts/tpch.sh
@@ -56,7 +56,7 @@ record_result() {
   local VALUE=$3
   if [ -n "$JOB_NAME" ]; then
     # Jenkins.
-    python $RECORD_STATS_SCRIPT $JOB_NAME $BUILD_NUMBER $TEST_NAME $ITER $VALUE
+    ambari-python-wrap $RECORD_STATS_SCRIPT $JOB_NAME $BUILD_NUMBER $TEST_NAME $ITER $VALUE
   else
     # Running locally.
     local STATS_FILE="$OUTDIR/tpch-$TEST_NAME.tsv"
diff --git a/src/kudu/scripts/write-jobs-stats-to-mysql.py b/src/kudu/scripts/write-jobs-stats-to-mysql.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/thirdparty/build-definitions.sh b/thirdparty/build-definitions.sh
@@ -166,7 +166,9 @@ build_or_find_python() {
   if [ -n "$PYTHON_EXECUTABLE" ]; then
     return
   fi
-
+  if command -v ambari-python-wrap >/dev/null; then
+    PYTHON_EXECUTABLE=$(command -v ambari-python-wrap)
+  fi
   # Build Python only if necessary.
   if [[ $(python3 -V 2>&1) =~ "Python 3." ]]; then
     PYTHON_EXECUTABLE=$(which python3)
diff --git a/thirdparty/postflight.py b/thirdparty/postflight.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/thirdparty/preflight.py b/thirdparty/preflight.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env ambari-python-wrap
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python`
	`1`	`+#!/usr/bin/env ambari-python-wrap`
`2`	`2`
`3`	`3`	`# Licensed to the Apache Software Foundation (ASF) under one`
`4`	`4`	`# or more contributor license agreements. See the NOTICE file`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python2`
	`1`	`+#!/usr/bin/env ambari-python-wrap`
`2`	`2`	`#`
`3`	`3`	`# Licensed to the Apache Software Foundation (ASF) under one`
`4`	`4`	`# or more contributor license agreements. See the NOTICE file`