diff options
author | Xuan Wang <xuanwn@google.com> | 2024-04-15 15:52:30 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-15 15:52:30 -0700 |
commit | 60c35badea03e44d81623a58fe560a0ad40dceb2 (patch) | |
tree | fdf5a8b06ada36cd7343ffb82391312891c64ca9 | |
parent | 81a913e71f1b2cba049244dc1882bd31d66508d3 (diff) | |
download | grpc-grpc-60c35badea03e44d81623a58fe560a0ad40dceb2.tar.gz |
[Python Dist] Fix grpc_distribtests_python (v1.63.x backport) (#36363)
Backport of #36352 to v1.63.x.
---
`setuptools` made a decision to change the artifact name it builds (from
`grpcio-health-checking` to `grpcio_health_checking`) in their latest
release (https://github.com/pypa/setuptools/issues/4300).
As a result, we need broaden our regex so that our tests can pickup the
correct files.
### Note
* Using `[_-]*` instead of `[_-]?` to match one character since `bash`
uses a different flavor of regular expressions called basic regular
expressions (BREs) which do not support the optional quantifier `?`.
<!--
If you know who should review your pull request, please assign it to
that
person, otherwise the pull request would get assigned randomly.
If your pull request is for a specific language, please add the
appropriate
lang label.
-->
-rwxr-xr-x | test/distrib/python/test_packages.sh | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/test/distrib/python/test_packages.sh b/test/distrib/python/test_packages.sh index 136632833b..fa6f2fceee 100755 --- a/test/distrib/python/test_packages.sh +++ b/test/distrib/python/test_packages.sh @@ -19,22 +19,25 @@ cd "$(dirname "$0")" shopt -s nullglob +echo "Testing Python packages with input artifacts:" +ls "$EXTERNAL_GIT_ROOT"/input_artifacts + if [[ "$1" == "binary" ]] then echo "Testing Python binary distribution" - ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-[0-9]*.whl) - TOOLS_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio_tools-[0-9]*.whl) - OBSERVABILITY_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio_observability-[0-9]*.whl) + ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio[-_0-9a-z.]*.whl) + TOOLS_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio[_-]*tools[-_0-9a-z.]*.whl) + OBSERVABILITY_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio[_-]*observability[-_0-9a-z.]*.whl) else echo "Testing Python source distribution" - ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-[0-9]*.tar.gz) - TOOLS_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-tools-[0-9]*.tar.gz) - OBSERVABILITY_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-observability-[0-9]*.tar.gz) + ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio[-_0-9a-z.]*.tar.gz) + TOOLS_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio[_-]*tools[-_0-9a-z.]*.tar.gz) + OBSERVABILITY_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio[_-]*observability[-_0-9a-z.]*.tar.gz) fi -HEALTH_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-health-checking-[0-9]*.tar.gz) -REFLECTION_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-reflection-[0-9]*.tar.gz) -TESTING_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-testing-[0-9]*.tar.gz) +HEALTH_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio[_-]*health[_-]*checking[-_0-9a-z.]*.tar.gz) +REFLECTION_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio[_-]*reflection[-_0-9a-z.]*.tar.gz) +TESTING_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio[_-]*testing[-_0-9a-z.]*.tar.gz) VIRTUAL_ENV=$(mktemp -d) python3 -m virtualenv "$VIRTUAL_ENV" |