From 988b1bed74ae604e445d032ed1e034cdbab6867a Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Sat, 18 Nov 2023 19:06:19 +0530 Subject: [PATCH] Separate proto gen --- dev-requirements.txt | 6 ------ gen-requirements.txt | 6 ++++++ scripts/proto_codegen.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 gen-requirements.txt diff --git a/dev-requirements.txt b/dev-requirements.txt index 5731c1545b..8ec964d1a8 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -10,12 +10,6 @@ sphinx-autodoc-typehints~=1.25 pytest==7.1.3 pytest-cov~=4.1 readme-renderer~=24.0 -# This version of grpcio-tools ships with protoc 3.19.4 which appears to be compatible with -# both protobuf 3.19.x and 4.x (see https://github.com/protocolbuffers/protobuf/issues/11123). -# Bump this version with caution to preserve compatibility with protobuf 3. -# https://github.com/open-telemetry/opentelemetry-python/blob/main/opentelemetry-proto/pyproject.toml#L28 -grpcio-tools==1.48.1 -mypy-protobuf~=3.0.0 # temporary fix. we should update the jinja, flask deps # See https://github.com/pallets/markupsafe/issues/282 # breaking change introduced in markupsafe causes jinja, flask to break diff --git a/gen-requirements.txt b/gen-requirements.txt new file mode 100644 index 0000000000..88f8817b2d --- /dev/null +++ b/gen-requirements.txt @@ -0,0 +1,6 @@ +# This version of grpcio-tools ships with protoc 3.19.4 which appears to be compatible with +# both protobuf 3.19.x and 4.x (see https://github.com/protocolbuffers/protobuf/issues/11123). +# Bump this version with caution to preserve compatibility with protobuf 3. +# https://github.com/open-telemetry/opentelemetry-python/blob/main/opentelemetry-proto/pyproject.toml#L28 +grpcio-tools==1.48.1 +mypy-protobuf~=3.0.0 diff --git a/scripts/proto_codegen.sh b/scripts/proto_codegen.sh index 53d8ad8fc7..26fb8b1ee8 100755 --- a/scripts/proto_codegen.sh +++ b/scripts/proto_codegen.sh @@ -32,7 +32,7 @@ echo "Creating temporary virtualenv at $venv_dir using $(python3 --version)" python3 -m venv $venv_dir source $venv_dir/bin/activate python -m pip install \ - -c $repo_root/dev-requirements.txt \ + -c $repo_root/gen-requirements.txt \ grpcio-tools mypy-protobuf echo 'python -m grpc_tools.protoc --version' python -m grpc_tools.protoc --version