Upgrade python calls to python3 (#1372)

a-maurice · web-flow · commit 2506fd978f91 · 2023-07-05T12:19:08.000-07:00
diff --git a/README.md b/README.md
@@ -53,8 +53,8 @@ directories to your PATH as needed.
 Note: Once python is installed you can use the following commands to install
 required packages:
 
-* python -m ensurepip --default-pip
-* python -m pip install --user absl-py
+* python3 -m ensurepip --default-pip
+* python3 -m pip install --user absl-py
 
 ### Prerequisites for Desktop
 The following prerequisites are required when building the libraries for
@@ -203,7 +203,7 @@ deliverable for both iOS and tvOS targets in the same XCode project.
 ``` bash
 # Install prereqs (like cocoapods)
 ./build_scripts/tvos/install_prereqs.sh
-python scripts/gha/build_ios_tvos.py -s . -b ios_tvos_build
+python3 scripts/gha/build_ios_tvos.py -s . -b ios_tvos_build
 ```
 
 
diff --git a/analytics/integration_test/build.gradle b/analytics/integration_test/build.gradle
@@ -84,7 +84,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''
diff --git a/app/integration_test/build.gradle b/app/integration_test/build.gradle
@@ -84,7 +84,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''
diff --git a/app_check/integration_test/build.gradle b/app_check/integration_test/build.gradle
@@ -101,7 +101,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''
diff --git a/auth/integration_test/build.gradle b/auth/integration_test/build.gradle
@@ -87,7 +87,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''
diff --git a/build_scripts/android/install_prereqs.sh b/build_scripts/android/install_prereqs.sh
@@ -36,21 +36,21 @@ if [[ -z $(which cmake) ]]; then
     exit 1
 fi
 
-if [[ -z $(which python) ]]; then
-    echo "Error, python is not installed or is not in the PATH."
+if [[ -z $(which python3) ]]; then
+    echo "Error, python3 is not installed or is not in the PATH."
     exit 1
 else
     updated_pip=0
-    if ! $(echo "import absl"$'\n' | python - 2> /dev/null); then
+    if ! $(echo "import absl"$'\n' | python3 - 2> /dev/null); then
       echo "Installing python packages."
       set -x
       # On Windows bash shell, sudo doesn't exist
       if [[ $(uname) == "Linux" ]] || [[ $(uname) == "Darwin" ]]; then
-        sudo python -m pip install --upgrade pip
+        sudo python3 -m pip install --upgrade pip
       else
-        python -m pip install  --upgrade pip
+        python3 -m pip install  --upgrade pip
       fi
-      pip install absl-py
+      pip3 install absl-py
       set +x
     fi
 fi
diff --git a/build_scripts/ios/install_prereqs.sh b/build_scripts/ios/install_prereqs.sh
@@ -12,16 +12,16 @@ if [[ -z $(which cmake) ]]; then
     exit 1
 fi
 
-if [[ -z $(which python) ]]; then
-    echo "Error, python is not installed or is not in the PATH."
+if [[ -z $(which python3) ]]; then
+    echo "Error, python3 is not installed or is not in the PATH."
     exit 1
 else
     updated_pip=0
-    if ! $(echo "import absl"$'\n'"import google.protobuf" | python - 2> /dev/null); then
+    if ! $(echo "import absl"$'\n'"import google.protobuf" | python3 - 2> /dev/null); then
 	echo "Installing python packages."
 	set -x
-	sudo python -m pip install --upgrade pip
-	pip install absl-py protobuf
+	sudo python3 -m pip install --upgrade pip
+	pip3 install absl-py protobuf
 	set +x
     fi
 fi
diff --git a/build_scripts/tvos/install_prereqs.sh b/build_scripts/tvos/install_prereqs.sh
@@ -12,16 +12,16 @@ if [[ -z $(which cmake) ]]; then
     exit 1
 fi
 
-if [[ -z $(which python) ]]; then
+if [[ -z $(which python3) ]]; then
     echo "Error, python is not installed or is not in the PATH."
     exit 1
 else
     updated_pip=0
-    if ! $(echo "import absl"$'\n' | python - 2> /dev/null); then
+    if ! $(echo "import absl"$'\n' | python3 - 2> /dev/null); then
 	echo "Installing python packages."
 	set -x
-	sudo python -m pip install --upgrade pip
-	pip install absl-py
+	sudo python3 -m pip install --upgrade pip
+	pip3 install absl-py
 	set +x
     fi
 fi
diff --git a/database/integration_test/build.gradle b/database/integration_test/build.gradle
@@ -88,7 +88,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''
diff --git a/dynamic_links/integration_test/build.gradle b/dynamic_links/integration_test/build.gradle
@@ -84,7 +84,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''
diff --git a/firestore/integration_test/build.gradle b/firestore/integration_test/build.gradle
@@ -89,7 +89,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''
diff --git a/firestore/integration_test_internal/build.gradle b/firestore/integration_test_internal/build.gradle
@@ -107,7 +107,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''
diff --git a/functions/integration_test/build.gradle b/functions/integration_test/build.gradle
@@ -88,7 +88,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''
diff --git a/gma/integration_test/build.gradle b/gma/integration_test/build.gradle
@@ -85,7 +85,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''
diff --git a/installations/integration_test/build.gradle b/installations/integration_test/build.gradle
@@ -84,7 +84,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''
diff --git a/messaging/integration_test/Podfile b/messaging/integration_test/Podfile
@@ -14,7 +14,7 @@ end
 
 post_install do |installer|
   # If this is running from inside the SDK directory, run the setup script.
-  system("if [[ -r ../../setup_integration_tests.py ]]; then python ../../setup_integration_tests.py .; fi")
-  system("/usr/bin/python ./download_googletest.py")
+  system("if [[ -r ../../setup_integration_tests.py ]]; then python3 ../../setup_integration_tests.py .; fi")
+  system("/usr/bin/python3 ./download_googletest.py")
 end
 
diff --git a/messaging/integration_test/build.gradle b/messaging/integration_test/build.gradle
@@ -84,7 +84,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''
diff --git a/remote_config/integration_test/build.gradle b/remote_config/integration_test/build.gradle
@@ -87,7 +87,7 @@ apply plugin: 'com.google.gms.google-services'
 task copyIntegrationTestFiles(type:Exec) {
   // If this is running form inside the SDK directory, run the setup script.
   if (project.file('../../setup_integration_tests.py').exists()) {
-    commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()
+    commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()
   }
   else {
     commandLine 'echo', ''
diff --git a/scripts/gha/build_desktop.py b/scripts/gha/build_desktop.py
@@ -24,13 +24,13 @@
 
 Usage examples:
 # Build all targets with x64 architecture, Release config and 8 cpu cores
-python scripts/gha/build_desktop.py --arch x64 --config Release -j 8
+python3 scripts/gha/build_desktop.py --arch x64 --config Release -j 8
 
 # Build all targets with default options and also build unit tests
-python scripts/gha/build_desktop.py --build_tests --arch x64
+python3 scripts/gha/build_desktop.py --build_tests --arch x64
 
 # Build only firebase_app and firebase_auth
-python scripts/gha/build_desktop.py --target firebase_app firebase_auth
+python3 scripts/gha/build_desktop.py --target firebase_app firebase_auth
 
 """
 
diff --git a/scripts/gha/build_testapps.py b/scripts/gha/build_testapps.py
@@ -19,7 +19,7 @@
 This tool has a number of dependencies (listed below). Once those are taken
 care of, here is an example of an execution of the tool (on MacOS):
 
-python build_testapps.py --t auth,messaging --p iOS
+python3 build_testapps.py --t auth,messaging --p iOS
 
 Critical flags:
 --t (full name: testapps, default: None)
@@ -29,7 +29,7 @@
 building the underlying SDK libraries. To build from a packaged/released SDK,
 supply the path to the SDK to --packaged_sdk:
 
-python build_testapps.py --t auth --p iOS --packaged_sdk ~/firebase_cpp_sdk
+python3 build_testapps.py --t auth --p iOS --packaged_sdk ~/firebase_cpp_sdk
 
 Under most circumstances the other flags don't need to be set, but can be
 seen by running --help. Note that all path flags will forcefully expand
@@ -47,7 +47,7 @@
 ----Python Dependencies----
 The requirements.txt file has the required dependencies for this Python tool.
 
-    pip install -r requirements.txt
+    pip3 install -r requirements.txt
 
 ----CMake (Desktop only)----
 CMake must be installed and on the system path.
diff --git a/scripts/gha/create_pull_request.py b/scripts/gha/create_pull_request.py
@@ -15,7 +15,7 @@
 """A utility to create pull requests.
 
 USAGE:
-  python scripts/gha/create_pull_request.py \
+  python3 scripts/gha/create_pull_request.py \
     --token ${{github.token}} \
     --head pr_branch \
     --base main \
diff --git a/scripts/gha/desktop_tester.py b/scripts/gha/desktop_tester.py
@@ -15,7 +15,7 @@
 """Runs and validates desktop C++ testapps.
 
 Usage:
-  python desktop_tester.py --testapp_dir ~/Downloads/testapps
+  python3 desktop_tester.py --testapp_dir ~/Downloads/testapps
 
 This will search --testapp_dir for files whose name is given by --testapp_name
 (default: "integration_test", or "integration_test.exe" on Windows), execute
diff --git a/scripts/gha/dismiss_reviews.py b/scripts/gha/dismiss_reviews.py
@@ -15,7 +15,7 @@
 """A utility to dismiss PR reviews.
 
 USAGE:
-  python scripts/gha/dismiss_reviews.py \
+  python3 scripts/gha/dismiss_reviews.py \
     --token ${{github.token}} \
     --pull_number ${{needs.check_trigger.outputs.pr_number}} \
     [--message 'Message to be posted on the dismissal.'] \
diff --git a/scripts/gha/gcs_uploader.py b/scripts/gha/gcs_uploader.py
@@ -15,7 +15,7 @@
 """Command line tool for submitting artifacts to Google Cloud Storage.
 
 Example usage:
-  python gcs_uploader.py --testapp_dir <dir> --key_file <path>
+  python3 gcs_uploader.py --testapp_dir <dir> --key_file <path>
 
 This will find desktop integration test artifacts in the testapp directory
 and upload them to a suitable location on GCS.
diff --git a/scripts/gha/inspect_built_libraries.py b/scripts/gha/inspect_built_libraries.py
@@ -26,11 +26,11 @@
 module but it is a good practice to run it from the root of the repo.
 
 # Inspect specific libraries by providing them explicitly.
-$ python scripts/gha/inspect_built_libraries.py build/app/libfirebase_app.a build/auth/libfirebase_auth.a
+$ python3 scripts/gha/inspect_built_libraries.py build/app/libfirebase_app.a build/auth/libfirebase_auth.a
 
 # Inspect all firebase libraries (default value for --library_filter is "firebase_")
 # by searching specified directory recursively.
-$ python scripts/gha/inspect_built_libraries.py build/
+$ python3 scripts/gha/inspect_built_libraries.py build/
 ****************************************************
 Library                                Architecture
 ****************************************************
@@ -42,18 +42,18 @@
 ...
 
 # To print full paths to libraries and specify a different library filter.
-$ python scripts/gha/inspect_built_libraries.py build/ --library_filter "grpc" --print_full_paths
+$ python3 scripts/gha/inspect_built_libraries.py build/ --library_filter "grpc" --print_full_paths
 ************************************************************************************
 Library                                                                Architecture
 ************************************************************************************
 build/external/src/firestore-build/external/src/grpc-build/libgrpc++.a x86_64
 build/external/src/firestore-build/external/src/grpc-build/libgrpc.a   x86_64
 
 # To print information for all libraries, set library_filter to an empty string.
-$ python scripts/gha/inspect_built_libraries.py build/ --library_filter ""
+$ python3 scripts/gha/inspect_built_libraries.py build/ --library_filter ""
 
 # On Windows, there is an additional column of information for msvc runtime.
-$ python scripts/gha/inspect_built_libraries.py build/
+$ python3 scripts/gha/inspect_built_libraries.py build/
 ******************************************************************
 Library                                 Architecture MSVC_Runtime
 ******************************************************************
diff --git a/scripts/gha/install_test_workflow_prereqs.sh b/scripts/gha/install_test_workflow_prereqs.sh
@@ -45,7 +45,7 @@ case "$OSTYPE" in
 esac
 echo "OS: ${OS}"
 
-pip install -r scripts/gha/python_requirements.txt
+pip3 install -r scripts/gha/python_requirements.txt
 
 git config --global credential.helper 'store --file /tmp/git-credentials'
 echo 'https://${GITHUB_TOKEN}@github.com' > /tmp/git-credentials
@@ -69,7 +69,7 @@ if [[ "${PLATFORM}" == "Desktop" ]]; then
     fi
     echo "VCPKG_TRIPLET=${VCPKG_TRIPLET}" >> $GITHUB_ENV
     echo "VCPKG_RESPONSE_FILE=external/vcpkg_${VCPKG_TRIPLET}_response_file.txt" >> $GITHUB_ENV
-    python scripts/gha/install_prereqs_desktop.py --gha_build --arch "${ARCH}" --ssl "${SSL}" ${TEST_ONLY} 
+    python3 scripts/gha/install_prereqs_desktop.py --gha_build --arch "${ARCH}" --ssl "${SSL}" ${TEST_ONLY} 
 fi
 
 if [[ "${TEST_ONLY}" == "" ]]; then
diff --git a/scripts/gha/it_workflow.py b/scripts/gha/it_workflow.py
@@ -19,7 +19,7 @@
 For PR comment, this script will update (create if not exist) the "Test Result" in comment.
 stage value: [start, progress, end]
 USAGE:
-  python scripts/gha/it_workflow.py --stage <stage> \
+  python3 scripts/gha/it_workflow.py --stage <stage> \
     --token ${{github.token}} \
     --issue_number ${{needs.check_trigger.outputs.pr_number}}\
     --actor ${{github.actor}} \
@@ -31,7 +31,7 @@
 with title "Nightly Integration Testing Report" and label "nightly-testing".
 stage value: [report]
 USAGE:
-  python scripts/gha/it_workflow.py --stage report \
+  python3 scripts/gha/it_workflow.py --stage report \
     --token ${{github.token}} \
     --actor ${{github.actor}} \
     --commit ${{needs.prepare_matrix.outputs.github_ref}} \
diff --git a/scripts/gha/lint_commenter.py b/scripts/gha/lint_commenter.py
@@ -20,7 +20,7 @@
 https://docs.github.com/en/rest/reference/actions#create-a-workflow-dispatch-event
 
 Usage:
-python lint_commenter.py -t github_token -p pr_number
+python3 lint_commenter.py -t github_token -p pr_number
        [-r git_repo_url] [-C curl_command] [-l lint_command]
 
 If -r is unspecified, uses the current repo.
diff --git a/scripts/gha/pr_file_commenter.py b/scripts/gha/pr_file_commenter.py
@@ -16,7 +16,7 @@
 """Take warnings/error lines from stdin and turn them into PR file comments.
 
 Usage:
-python pr_file_commenter.py -t github_token -p pr_number
+python3 pr_file_commenter.py -t github_token -p pr_number
        -T comment_tag [-r git_repo_url] [-C curl_command]
        [-P comment_prefix] [-S comment_suffix] [-d base_directory]
        < COMMENT_LINES
diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py
diff --git a/scripts/gha/read_ftl_test_result.py b/scripts/gha/read_ftl_test_result.py
diff --git a/scripts/gha/report_build_status.py b/scripts/gha/report_build_status.py
diff --git a/scripts/gha/restore_secrets.py b/scripts/gha/restore_secrets.py
diff --git a/scripts/gha/summarize_test_results.py b/scripts/gha/summarize_test_results.py
diff --git a/scripts/gha/test_simulator.py b/scripts/gha/test_simulator.py
diff --git a/scripts/gha/trigger_workflow.py b/scripts/gha/trigger_workflow.py
diff --git a/scripts/gha/update_issue_comment.py b/scripts/gha/update_issue_comment.py
diff --git a/storage/integration_test/build.gradle b/storage/integration_test/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ apply plugin: 'com.google.gms.google-services'`
`84`	`84`	`task copyIntegrationTestFiles(type:Exec) {`
`85`	`85`	`// If this is running form inside the SDK directory, run the setup script.`
`86`	`86`	`if (project.file('../../setup_integration_tests.py').exists()) {`
`87`		`- commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()`
	`87`	`+ commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()`
`88`	`88`	`}`
`89`	`89`	`else {`
`90`	`90`	`commandLine 'echo', ''`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ apply plugin: 'com.google.gms.google-services'`
`101`	`101`	`task copyIntegrationTestFiles(type:Exec) {`
`102`	`102`	`// If this is running form inside the SDK directory, run the setup script.`
`103`	`103`	`if (project.file('../../setup_integration_tests.py').exists()) {`
`104`		`- commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()`
	`104`	`+ commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()`
`105`	`105`	`}`
`106`	`106`	`else {`
`107`	`107`	`commandLine 'echo', ''`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ apply plugin: 'com.google.gms.google-services'`
`87`	`87`	`task copyIntegrationTestFiles(type:Exec) {`
`88`	`88`	`// If this is running form inside the SDK directory, run the setup script.`
`89`	`89`	`if (project.file('../../setup_integration_tests.py').exists()) {`
`90`		`- commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()`
	`90`	`+ commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()`
`91`	`91`	`}`
`92`	`92`	`else {`
`93`	`93`	`commandLine 'echo', ''`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ apply plugin: 'com.google.gms.google-services'`
`88`	`88`	`task copyIntegrationTestFiles(type:Exec) {`
`89`	`89`	`// If this is running form inside the SDK directory, run the setup script.`
`90`	`90`	`if (project.file('../../setup_integration_tests.py').exists()) {`
`91`		`- commandLine 'python', '../../setup_integration_tests.py', project.projectDir.toString()`
	`91`	`+ commandLine 'python3', '../../setup_integration_tests.py', project.projectDir.toString()`
`92`	`92`	`}`
`93`	`93`	`else {`
`94`	`94`	`commandLine 'echo', ''`