commit 151e632bac75f6179043655ae54aa6f835508e72
author Adam Cozzette <acozzette@google.com> Thu Sep 23 15:08:32 2021 -0700
committer Adam Cozzette <acozzette@google.com> Fri Sep 24 12:30:58 2021 -0700
tree 5d51f8d0e1e22c188cbc6ecc769a4912db9a6ad5
parent 2fffff8320a7afd0979300b2a9baadc72ca82f53

Fix dist install test by ensuring that we use Python 3 (#9011)

* Fix dist install test by ensuring that we use Python 3

Now that we have dropped Python 2 support, we need to make sure this
install test uses Python 3.

* Update Docker image to install Python 3 version of setuptools

* Run pip3 instead of pip

kokoro/linux/dockerfile/test/java_stretch/Dockerfile

diff --git a/kokoro/linux/dockerfile/test/java_stretch/Dockerfile b/kokoro/linux/dockerfile/test/java_stretch/Dockerfile
index 3e72046..b9f562a 100644
--- a/kokoro/linux/dockerfile/test/java_stretch/Dockerfile
+++ b/kokoro/linux/dockerfile/test/java_stretch/Dockerfile
@@ -24,7 +24,7 @@
   maven \
   openjdk-8-jdk \
   # Python dependencies
-  python-setuptools \
-  python-pip \
+  python3-setuptools \
+  python3-pip \
   virtualenv \
   && apt-get clean

tests.sh

diff --git a/tests.sh b/tests.sh
index 1955b7b..5dc2eb6 100755
--- a/tests.sh
+++ b/tests.sh
@@ -112,8 +112,8 @@
   virtualenv --no-site-packages venv
   source venv/bin/activate
   pushd python
-  python setup.py clean build sdist
-  pip install dist/protobuf-*.tar.gz
+  python3 setup.py clean build sdist
+  pip3 install dist/protobuf-*.tar.gz
   popd
   deactivate
   rm -rf python/venv