Skip to content

Commit 84955e7

Browse files
mehrdadamehrdada
committed
Upmerge v1.13.x into master
2 parents aaa063a + 062f369 commit 84955e7

4 files changed

Lines changed: 26 additions & 11 deletions

File tree

‎src/python/grpcio_testing/MANIFEST.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
include grpc_version.py
2+
recursive-include grpc_testing *.py
3+
global-exclude *.pyc

‎src/python/grpcio_testing/README.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
gRPC Python Testing Package
2+
===========================
3+
4+
Testing utilities for gRPC Python
5+
6+
Dependencies
7+
------------
8+
9+
Depends on the `grpcio` package, available from PyPI via `pip install grpcio`.
10+

‎test/distrib/python/test_packages.sh‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ else
2828
echo "Testing Python source distribution"
2929
ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-[0-9]*.tar.gz)
3030
TOOLS_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-tools-[0-9]*.tar.gz)
31-
HEALTH_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-health-checking-[0-9]*.tar.gz)
32-
REFLECTION_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-reflection-[0-9]*.tar.gz)
3331
fi
3432

33+
HEALTH_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-health-checking-[0-9]*.tar.gz)
34+
REFLECTION_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-reflection-[0-9]*.tar.gz)
35+
TESTING_ARCHIVES=("$EXTERNAL_GIT_ROOT"/input_artifacts/grpcio-testing-[0-9]*.tar.gz)
36+
3537
VIRTUAL_ENV=$(mktemp -d)
3638
virtualenv "$VIRTUAL_ENV"
3739
PYTHON=$VIRTUAL_ENV/bin/python
@@ -53,13 +55,9 @@ function at_least_one_installs() {
5355

5456
at_least_one_installs "${ARCHIVES[@]}"
5557
at_least_one_installs "${TOOLS_ARCHIVES[@]}"
56-
57-
if [[ "$1" == "source" ]]
58-
then
59-
echo "Testing Python health and reflection packages"
60-
at_least_one_installs "${HEALTH_ARCHIVES[@]}"
61-
at_least_one_installs "${REFLECTION_ARCHIVES[@]}"
62-
fi
58+
at_least_one_installs "${HEALTH_ARCHIVES[@]}"
59+
at_least_one_installs "${REFLECTION_ARCHIVES[@]}"
60+
at_least_one_installs "${TESTING_ARCHIVES[@]}"
6361

6462

6563
#

‎tools/run_tests/artifacts/build_artifact_python.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,16 @@ then
9999
"${PIP}" install grpcio --no-index --find-links "file://$ARTIFACT_DIR/"
100100
"${PIP}" install grpcio-tools --no-index --find-links "file://$ARTIFACT_DIR/"
101101

102-
# Build gRPC health-checking source distribution
102+
# Build grpcio_testing source distribution
103+
${SETARCH_CMD} "${PYTHON}" src/python/grpcio_testing/setup.py sdist
104+
cp -r src/python/grpcio_testing/dist/* "$ARTIFACT_DIR"
105+
106+
# Build grpcio_health_checking source distribution
103107
${SETARCH_CMD} "${PYTHON}" src/python/grpcio_health_checking/setup.py \
104108
preprocess build_package_protos sdist
105109
cp -r src/python/grpcio_health_checking/dist/* "$ARTIFACT_DIR"
106110

107-
# Build gRPC reflection source distribution
111+
# Build grpcio_reflection source distribution
108112
${SETARCH_CMD} "${PYTHON}" src/python/grpcio_reflection/setup.py \
109113
preprocess build_package_protos sdist
110114
cp -r src/python/grpcio_reflection/dist/* "$ARTIFACT_DIR"

0 commit comments

Comments
 (0)