package: fix packaging using 'resources' package

Author: willcl-ark

.github/workflows/deploy.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Build and push production RPC image
         uses: docker/build-push-action@v5
         with:
-          file: images/rpc/Dockerfile_prod
+          file: resources/images/rpc/Dockerfile_prod
           platforms: linux/amd64,linux/arm64
           context: .
           push: true
@@ -50,7 +50,7 @@ jobs:
         if: github.ref == 'refs/heads/main'
         uses: docker/build-push-action@v5
         with:
-          file: images/rpc/Dockerfile_dev
+          file: resources/images/rpc/Dockerfile_dev
           platforms: linux/amd64,linux/arm64
           context: .
           push: true

.github/workflows/test.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Build and export
         uses: docker/build-push-action@v5
         with:
-          file: images/rpc/Dockerfile_prod
+          file: resources/images/rpc/Dockerfile_prod
           context: .
           tags: warnet/dev
           cache-from: type=gha
@@ -74,13 +74,13 @@ jobs:
           uv pip install -e .
 
           echo "Contents of warnet-rpc-statefulset-dev.yaml being used:"
-          cat manifests/warnet-rpc-statefulset-dev.yaml
+          cat resources/manifests/warnet-rpc-statefulset-dev.yaml
 
           echo Setting up k8s
-          kubectl apply -f manifests/namespace.yaml
-          kubectl apply -f manifests/rbac-config.yaml
-          kubectl apply -f manifests/warnet-rpc-service.yaml
-          kubectl apply -f manifests/warnet-rpc-statefulset-dev.yaml
+          kubectl apply -f resources/manifests/namespace.yaml
+          kubectl apply -f resources/manifests/rbac-config.yaml
+          kubectl apply -f resources/manifests/warnet-rpc-service.yaml
+          kubectl apply -f resources/manifests/warnet-rpc-statefulset-dev.yaml
           kubectl config set-context --current --namespace=warnet
 
           echo sleeping for 30s to give k8s time to boot

MANIFEST.in

@@ -1,4 +1,2 @@
 include src/warnet/*.json
-graft images
-graft manifests
-graft scripts
+graft resources

justfile

@@ -5,10 +5,10 @@ default:
     just --list
 
 cluster:
-    kubectl apply -f manifests/namespace.yaml
-    kubectl apply -f manifests/rbac-config.yaml
-    kubectl apply -f manifests/warnet-rpc-service.yaml
-    kubectl apply -f manifests/warnet-rpc-statefulset.yaml
+    kubectl apply -f resources/manifests/namespace.yaml
+    kubectl apply -f resources/manifests/rbac-config.yaml
+    kubectl apply -f resources/manifests/warnet-rpc-service.yaml
+    kubectl apply -f resources/manifests/warnet-rpc-statefulset.yaml
 
 # Setup and start the RPC in dev mode with minikube
 start:
@@ -32,14 +32,14 @@ start:
     check_minikube
 
     # Build image in local registry and load into minikube
-    docker build -t warnet/dev -f images/rpc/Dockerfile_dev images/rpc --load
+    docker build -t warnet/dev -f resources/images/rpc/Dockerfile_dev resources/images/rpc --load
     minikube image load warnet/dev
 
     # Setup k8s
-    kubectl apply -f manifests/namespace.yaml
-    kubectl apply -f manifests/rbac-config.yaml
-    kubectl apply -f manifests/warnet-rpc-service.yaml
-    kubectl apply -f manifests/warnet-rpc-statefulset-dev.yaml
+    kubectl apply -f resources/manifests/namespace.yaml
+    kubectl apply -f resources/manifests/rbac-config.yaml
+    kubectl apply -f resources/manifests/warnet-rpc-service.yaml
+    kubectl apply -f resources/manifests/warnet-rpc-statefulset-dev.yaml
     kubectl config set-context --current --namespace=warnet
 
     # Check for warnet-rpc container
@@ -68,11 +68,11 @@ stop:
 
 # Setup and start the RPC in dev mode with Docker Desktop
 startd:
-    docker build -t warnet/dev -f images/rpc/Dockerfile_dev images/rpc --load
-    kubectl apply -f manifests/namespace.yaml
-    kubectl apply -f manifests/rbac-config.yaml
-    kubectl apply -f manifests/warnet-rpc-service.yaml
-    sed 's?/mnt/src?'`PWD`'?g' manifests/warnet-rpc-statefulset-dev.yaml | kubectl apply -f -
+    docker build -t warnet/dev -f resources/images/rpc/Dockerfile_dev resources/images/rpc --load
+    kubectl apply -f resources/manifests/namespace.yaml
+    kubectl apply -f resources/manifests/rbac-config.yaml
+    kubectl apply -f resources/manifests/warnet-rpc-service.yaml
+    sed 's?/mnt/src?'`PWD`'?g' resouces/manifests/warnet-rpc-statefulset-dev.yaml | kubectl apply -f -
     kubectl config set-context --current --namespace=warnet
 
     echo waiting for rpc to come online
@@ -104,10 +104,10 @@ build branch tag registry=registry repo=repo build-args=build-args action=load:
     warcli image build --registry={{registry}} --repo={{repo}} --branch={{branch}} --arches="{{arches}}" --tag={{tag}} --build-args="{{build-args}}" --action={{action}}
 
 installlogging:
-    ./scripts/install_logging.sh
+    resources/scripts/install_logging.sh
 
 connectlogging:
-    ./scripts/connect_logging.sh
+    resources/scripts/connect_logging.sh
 
 # Format and lint all files
 lint:

pyproject.toml

@@ -32,8 +32,11 @@ build-backend = "setuptools.build_meta"
 [tool.setuptools.dynamic]
 dependencies = {file = ["requirements.txt"]}
 
+[tool.setuptools]
+include-package-data = true
+
 [tool.setuptools.packages.find]
-where = ["src"]
+where = ["src", "resources"]
 
 [tool.ruff]
 extend-exclude = [