Commit 84efa77e authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'pr-g-any' into 'develop' 

fix: generated code imports

See merge request !339
parents a324e412 be439e4d

proto/generate_code_python.sh

+1 −1
Original line number Diff line number Diff line
@@ -42,4 +42,4 @@ python3 -m grpc_tools.protoc -I=./ --python_out=src/python/ --grpc_python_out=sr 
python3 -m grpc_tools.protoc -I=./ --python_out=src/python/asyncio --grpclib_python_out=src/python/asyncio *.proto



# Arrange generated code imports to enable imports from arbitrary subpackages

find src/python -type f -iname *.py -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;
 
find src/python -type f -iname *.py -exec sed -i -E 's/^(import\ .*)_pb2/from . \1_pb2/g' {} \;

proto/monitoring.proto

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

proto/ztp_server.proto

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

src/analytics/frontend/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ RUN touch __init__.py 
COPY proto/*.proto ./

RUN python3 -m grpc_tools.protoc -I=. --python_out=. --grpc_python_out=. *.proto

RUN rm *.proto

RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;

RUN find . -type f -exec sed -i -E 's/^(import\ .*)_pb2/from . \1_pb2/g' {} \;



# Create component sub-folders, get specific Python packages

RUN mkdir -p /var/teraflow/analytics/frontend

src/automation/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ RUN touch __init__.py 
COPY proto/*.proto ./

RUN python3 -m grpc_tools.protoc -I=. --python_out=. --grpc_python_out=. *.proto

RUN rm *.proto

RUN find . -type f -exec sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' {} \;

RUN find . -type f -exec sed -i -E 's/^(import\ .*)_pb2/from . \1_pb2/g' {} \;



# Create component sub-folders, get specific Python packages

RUN mkdir -p /var/teraflow/automation