From ec40f07ddb98d7d85dbdc171749c679f416c6fd0 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Fri, 19 Mar 2021 13:11:18 -0700 Subject: [PATCH] Revert "Pin xDS interop test runner dependencies (#25665)" (#25768) This reverts commit 7cf91c717acefdea91291266375b5ded128a2ed1. --- .../grpc_xds_bazel_python_test_in_docker.sh | 4 ++-- .../linux/grpc_xds_bazel_test_in_docker.sh | 4 ++-- .../linux/grpc_xds_csharp_test_in_docker.sh | 4 ++-- .../linux/grpc_xds_php_test_in_docker.sh | 4 ++-- .../linux/grpc_xds_ruby_test_in_docker.sh | 4 ++-- .../linux/xds_interop_dependencies/pip.lock | 1 - .../requirements.lock | 24 ------------------- 7 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 tools/internal_ci/linux/xds_interop_dependencies/pip.lock delete mode 100644 tools/internal_ci/linux/xds_interop_dependencies/requirements.lock diff --git a/tools/internal_ci/linux/grpc_xds_bazel_python_test_in_docker.sh b/tools/internal_ci/linux/grpc_xds_bazel_python_test_in_docker.sh index 619a1daa5da..963a33cf38b 100755 --- a/tools/internal_ci/linux/grpc_xds_bazel_python_test_in_docker.sh +++ b/tools/internal_ci/linux/grpc_xds_bazel_python_test_in_docker.sh @@ -25,8 +25,8 @@ cd /var/local/git/grpc VIRTUAL_ENV=$(mktemp -d) virtualenv "$VIRTUAL_ENV" -p python3 PYTHON="$VIRTUAL_ENV"/bin/python -"$PYTHON" -m pip install -r tools/internal_ci/linux/xds_interop_dependencies/pip.lock -"$PYTHON" -m pip install -r tools/internal_ci/linux/xds_interop_dependencies/requirements.lock +"$PYTHON" -m pip install --upgrade pip==19.3.1 +"$PYTHON" -m pip install --upgrade grpcio-tools google-api-python-client google-auth-httplib2 oauth2client # Prepare generated Python code. TOOLS_DIR=tools/run_tests diff --git a/tools/internal_ci/linux/grpc_xds_bazel_test_in_docker.sh b/tools/internal_ci/linux/grpc_xds_bazel_test_in_docker.sh index 9d6a0f90d7b..851104d5735 100755 --- a/tools/internal_ci/linux/grpc_xds_bazel_test_in_docker.sh +++ b/tools/internal_ci/linux/grpc_xds_bazel_test_in_docker.sh @@ -25,8 +25,8 @@ cd /var/local/git/grpc VIRTUAL_ENV=$(mktemp -d) virtualenv "$VIRTUAL_ENV" -p python3 PYTHON="$VIRTUAL_ENV"/bin/python -"$PYTHON" -m pip install -r tools/internal_ci/linux/xds_interop_dependencies/pip.lock -"$PYTHON" -m pip install -r tools/internal_ci/linux/xds_interop_dependencies/requirements.lock +"$PYTHON" -m pip install --upgrade pip==19.3.1 +"$PYTHON" -m pip install --upgrade grpcio grpcio-tools google-api-python-client google-auth-httplib2 oauth2client # Prepare generated Python code. TOOLS_DIR=tools/run_tests diff --git a/tools/internal_ci/linux/grpc_xds_csharp_test_in_docker.sh b/tools/internal_ci/linux/grpc_xds_csharp_test_in_docker.sh index 4d5aedc3aa9..9d45056a030 100755 --- a/tools/internal_ci/linux/grpc_xds_csharp_test_in_docker.sh +++ b/tools/internal_ci/linux/grpc_xds_csharp_test_in_docker.sh @@ -25,8 +25,8 @@ cd /var/local/git/grpc VIRTUAL_ENV=$(mktemp -d) virtualenv "$VIRTUAL_ENV" -p python3 PYTHON="$VIRTUAL_ENV"/bin/python -"$PYTHON" -m pip install -r tools/internal_ci/linux/xds_interop_dependencies/pip.lock -"$PYTHON" -m pip install -r tools/internal_ci/linux/xds_interop_dependencies/requirements.lock +"$PYTHON" -m pip install --upgrade pip==19.3.1 +"$PYTHON" -m pip install --upgrade grpcio grpcio-tools google-api-python-client google-auth-httplib2 oauth2client # Prepare generated Python code. TOOLS_DIR=tools/run_tests diff --git a/tools/internal_ci/linux/grpc_xds_php_test_in_docker.sh b/tools/internal_ci/linux/grpc_xds_php_test_in_docker.sh index 539913de0ee..e518072151f 100755 --- a/tools/internal_ci/linux/grpc_xds_php_test_in_docker.sh +++ b/tools/internal_ci/linux/grpc_xds_php_test_in_docker.sh @@ -25,8 +25,8 @@ cd /var/local/git/grpc VIRTUAL_ENV=$(mktemp -d) virtualenv "$VIRTUAL_ENV" -p python3 PYTHON="$VIRTUAL_ENV"/bin/python -"$PYTHON" -m pip install -r tools/internal_ci/linux/xds_interop_dependencies/pip.lock -"$PYTHON" -m pip install -r tools/internal_ci/linux/xds_interop_dependencies/requirements.lock +"$PYTHON" -m pip install --upgrade pip==19.3.1 +"$PYTHON" -m pip install --upgrade grpcio-tools google-api-python-client google-auth-httplib2 oauth2client # Prepare generated Python code. TOOLS_DIR=tools/run_tests diff --git a/tools/internal_ci/linux/grpc_xds_ruby_test_in_docker.sh b/tools/internal_ci/linux/grpc_xds_ruby_test_in_docker.sh index 277f8dd1f49..41051800de2 100755 --- a/tools/internal_ci/linux/grpc_xds_ruby_test_in_docker.sh +++ b/tools/internal_ci/linux/grpc_xds_ruby_test_in_docker.sh @@ -25,8 +25,8 @@ cd /var/local/git/grpc VIRTUAL_ENV=$(mktemp -d) virtualenv "$VIRTUAL_ENV" -p python3 PYTHON="$VIRTUAL_ENV"/bin/python -"$PYTHON" -m pip install -r tools/internal_ci/linux/xds_interop_dependencies/pip.lock -"$PYTHON" -m pip install -r tools/internal_ci/linux/xds_interop_dependencies/requirements.lock +"$PYTHON" -m pip install --upgrade pip==19.3.1 +"$PYTHON" -m pip install --upgrade grpcio-tools google-api-python-client google-auth-httplib2 oauth2client # Prepare generated Python code. TOOLS_DIR=tools/run_tests diff --git a/tools/internal_ci/linux/xds_interop_dependencies/pip.lock b/tools/internal_ci/linux/xds_interop_dependencies/pip.lock deleted file mode 100644 index 3877da207f9..00000000000 --- a/tools/internal_ci/linux/xds_interop_dependencies/pip.lock +++ /dev/null @@ -1 +0,0 @@ -pip==19.3.1 diff --git a/tools/internal_ci/linux/xds_interop_dependencies/requirements.lock b/tools/internal_ci/linux/xds_interop_dependencies/requirements.lock deleted file mode 100644 index 43b8738bd29..00000000000 --- a/tools/internal_ci/linux/xds_interop_dependencies/requirements.lock +++ /dev/null @@ -1,24 +0,0 @@ -cachetools==4.2.1 -certifi==2020.12.5 -chardet==4.0.0 -google-api-core==1.26.1 -google-api-python-client==2.0.2 -google-auth==1.27.1 -google-auth-httplib2==0.1.0 -googleapis-common-protos==1.53.0 -grpcio==1.36.1 -grpcio-tools==1.36.1 -httplib2==0.19.0 -idna==2.10 -oauth2client==4.1.3 -packaging==20.9 -protobuf==3.15.5 -pyasn1==0.4.8 -pyasn1-modules==0.2.8 -pyparsing==2.4.7 -pytz==2021.1 -requests==2.25.1 -rsa==4.7.2 -six==1.15.0 -uritemplate==3.0.1 -urllib3==1.26.3