Revert "[interop] Add absl dependency to interop server" (#33676)

Reverts grpc/grpc#33647
pull/33683/head
Vignesh Babu 2 years ago committed by GitHub
parent b21152269d
commit c9eeca9681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      requirements.bazel.txt
  2. 1
      src/python/grpcio_tests/setup.py
  3. 1
      src/python/grpcio_tests/tests/interop/BUILD.bazel
  4. 17
      src/python/grpcio_tests/tests/interop/server.py
  5. 8
      src/python/grpcio_tests/tests_aio/interop/server.py
  6. 2
      tools/run_tests/helper_scripts/build_python.sh

@ -15,4 +15,3 @@ setuptools==44.1.1
xds-protos==0.0.11 xds-protos==0.0.11
opencensus==0.10.0 opencensus==0.10.0
opencensus-ext-stackdriver==0.8.0 opencensus-ext-stackdriver==0.8.0
absl-py==1.4.0

@ -47,7 +47,6 @@ INSTALL_REQUIRES = (
"protobuf>=4.21.6rc1,!=4.22.0.*", "protobuf>=4.21.6rc1,!=4.22.0.*",
"google-auth>=1.17.2", "google-auth>=1.17.2",
"requests>=2.14.2", "requests>=2.14.2",
"absl-py>=1.4.0",
) )
COMMAND_CLASS = { COMMAND_CLASS = {

@ -94,7 +94,6 @@ py_library(
"//src/proto/grpc/testing:py_test_proto", "//src/proto/grpc/testing:py_test_proto",
"//src/python/grpcio/grpc:grpcio", "//src/python/grpcio/grpc:grpcio",
"//src/python/grpcio_tests/tests/unit:test_common", "//src/python/grpcio_tests/tests/unit:test_common",
requirement("absl-py"),
], ],
) )

@ -13,11 +13,10 @@
# limitations under the License. # limitations under the License.
"""The Python implementation of the GRPC interoperability test server.""" """The Python implementation of the GRPC interoperability test server."""
import argparse
from concurrent import futures from concurrent import futures
import logging import logging
from absl import app
from absl.flags import argparse_flags
import grpc import grpc
from src.proto.grpc.testing import test_pb2_grpc from src.proto.grpc.testing import test_pb2_grpc
@ -29,8 +28,8 @@ logging.basicConfig()
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
def parse_interop_server_arguments(argv): def parse_interop_server_arguments():
parser = argparse_flags.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument( parser.add_argument(
"--port", type=int, required=True, help="the port on which to serve" "--port", type=int, required=True, help="the port on which to serve"
) )
@ -46,7 +45,7 @@ def parse_interop_server_arguments(argv):
type=resources.parse_bool, type=resources.parse_bool,
help="require an ALTS connection", help="require an ALTS connection",
) )
return parser.parse_args(argv[1:]) return parser.parse_args()
def get_server_credentials(use_tls): def get_server_credentials(use_tls):
@ -58,7 +57,9 @@ def get_server_credentials(use_tls):
return grpc.alts_server_credentials() return grpc.alts_server_credentials()
def serve(args): def serve():
args = parse_interop_server_arguments()
server = test_common.test_server() server = test_common.test_server()
test_pb2_grpc.add_TestServiceServicer_to_server( test_pb2_grpc.add_TestServiceServicer_to_server(
service.TestService(), server service.TestService(), server
@ -76,6 +77,4 @@ def serve(args):
if __name__ == "__main__": if __name__ == "__main__":
app.run( serve()
serve, flags_parser=parse_interop_server_arguments
)

@ -16,7 +16,6 @@
import argparse import argparse
import asyncio import asyncio
import logging import logging
import sys
import grpc import grpc
@ -28,7 +27,9 @@ _LOGGER = logging.getLogger(__name__)
_LOGGER.setLevel(logging.DEBUG) _LOGGER.setLevel(logging.DEBUG)
async def serve(args): async def serve():
args = interop_server_lib.parse_interop_server_arguments()
if args.use_tls or args.use_alts: if args.use_tls or args.use_alts:
credentials = interop_server_lib.get_server_credentials(args.use_tls) credentials = interop_server_lib.get_server_credentials(args.use_tls)
address, server = await _test_server.start_test_server( address, server = await _test_server.start_test_server(
@ -46,5 +47,4 @@ async def serve(args):
if __name__ == "__main__": if __name__ == "__main__":
args = interop_server_lib.parse_interop_server_arguments(sys.argv) asyncio.get_event_loop().run_until_complete(serve())
asyncio.get_event_loop().run_until_complete(serve(args))

@ -209,7 +209,7 @@ pip_install_dir "$ROOT/src/python/grpcio_testing"
# Build/install tests # Build/install tests
pip_install coverage==4.4 oauth2client==4.1.0 \ pip_install coverage==4.4 oauth2client==4.1.0 \
google-auth>=1.17.2 requests==2.14.2 \ google-auth>=1.17.2 requests==2.14.2 \
googleapis-common-protos>=1.5.5 rsa==4.0 absl-py==1.4.0 googleapis-common-protos>=1.5.5 rsa==4.0
$VENV_PYTHON "$ROOT/src/python/grpcio_tests/setup.py" preprocess $VENV_PYTHON "$ROOT/src/python/grpcio_tests/setup.py" preprocess
$VENV_PYTHON "$ROOT/src/python/grpcio_tests/setup.py" build_package_protos $VENV_PYTHON "$ROOT/src/python/grpcio_tests/setup.py" build_package_protos
pip_install_dir "$ROOT/src/python/grpcio_tests" pip_install_dir "$ROOT/src/python/grpcio_tests"

Loading…
Cancel
Save