fix(package): move proto dir inside control

Fixes: #178

Signed-off-by: Ernesto Puerta <[email protected]>

.dockerignore

@@ -1,7 +1,7 @@
 **
 # Exclude everything except:
 !control/*.py
-!proto/*.proto
+!control/proto/*.proto
 !pyproject.toml
 !pdm.lock
 !pdm.toml

.env

@@ -1,5 +1,5 @@
 # Globals
-VERSION="0.0.2"
+VERSION="0.0.3"
 CEPH_VERSION="17.2.6"
 SPDK_VERSION="23.01"
 MAINTAINER="Ceph Developers <[email protected]>"

Dockerfile

@@ -85,7 +85,7 @@ LABEL io.ceph.component="$NVMEOF_NAME" \
       io.ceph.git.branch="$NVMEOF_GIT_BRANCH" \
       io.ceph.git.commit="$NVMEOF_GIT_COMMIT"
 
-ENV PYTHONPATH=$APPDIR/proto:$APPDIR/__pypackages__/$PYTHON_MAJOR.$PYTHON_MINOR/lib
+ENV PYTHONPATH=$APPDIR/__pypackages__/$PYTHON_MAJOR.$PYTHON_MINOR/lib
 
 WORKDIR $APPDIR
 
@@ -120,7 +120,6 @@ RUN \
     pdm "$PDM_INSTALL_CMD" $PDM_INSTALL_FLAGS
 
 COPY . .
-RUN pdm run protoc
 
 #------------------------------------------------------------------------------
 FROM python-intermediate

control/cli.py

@@ -15,8 +15,8 @@
 
 from functools import wraps
 
-from proto import gateway_pb2_grpc as pb2_grpc
-from proto import gateway_pb2 as pb2
+from .proto import gateway_pb2_grpc as pb2_grpc
+from .proto import gateway_pb2 as pb2
 
 
 def argument(*name_or_flags, **kwargs):

control/grpc.py

@@ -17,8 +17,8 @@
 import spdk.rpc.nvmf as rpc_nvmf
 
 from google.protobuf import json_format
-from proto import gateway_pb2 as pb2
-from proto import gateway_pb2_grpc as pb2_grpc
+from .proto import gateway_pb2 as pb2
+from .proto import gateway_pb2_grpc as pb2_grpc
 
 
 class GatewayService(pb2_grpc.GatewayServicer):

control/server.py

@@ -25,8 +25,8 @@
 import spdk.rpc.client as rpc_client
 import spdk.rpc.nvmf as rpc_nvmf
 
-from proto import gateway_pb2 as pb2
-from proto import gateway_pb2_grpc as pb2_grpc
+from .proto import gateway_pb2 as pb2
+from .proto import gateway_pb2_grpc as pb2_grpc
 from .state import GatewayState, LocalGatewayState, OmapGatewayState, GatewayStateHandler
 from .grpc import GatewayService
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "ceph-nvmeof"
-version = "0.0.2"
+version = "0.0.3"
 description = "Service to provide Ceph storage over NVMe-oF protocol"
 readme = "README.md"
 requires-python = "~=3.9"
@@ -29,7 +29,8 @@ dependencies = [
 ]
 
 [tool.pdm.scripts]
-protoc = {call = "grpc_tools.command:build_package_protos('proto')"}
+protoc = {call = "grpc_tools.command:build_package_protos('src.proto')"}
+pre_build = {composite = ["protoc"]}
 
 [project.urls]
 #homepage = ""