From 6e75a1f1f26ac6b323a822647ae33469ec359c20 Mon Sep 17 00:00:00 2001
From: "David M. Raker" <david.raker@pnnl.gov>
Date: Tue, 3 Mar 2026 16:32:54 -0800
Subject: [PATCH] Updated pyproject.toml to correctly handle vctl driver
 subcommand (vdrv).

---
 pyproject.toml                                              | 4 ++--
 setup_vdrv.py                                               | 6 +++---
 .../vdrv => src/volttron/plugins/vctl/driver}/__init__.py   | 0
 .../vdrv.py => src/volttron/plugins/vctl/driver/parser.py   | 0
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename {scripts/vdrv => src/volttron/plugins/vctl/driver}/__init__.py (100%)
 rename scripts/vdrv/vdrv.py => src/volttron/plugins/vctl/driver/parser.py (100%)

diff --git a/pyproject.toml b/pyproject.toml
index 92f18cd..71ae773 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ readme = "README.md"
 repository = "https://github.com/eclipse-volttron/platform-driver-agent"
 homepage = "https://github.com/eclipse-volttron/platform-driver-agent"
 keywords = []
-packages = [ { include = "platform_driver", from = "src" } ]
+packages = [ { include = "platform_driver", from = "src" }, { include = "volttron", from = "src"} ]
 classifiers = [
     "Programming Language :: Python :: 3 :: Only",
     "Intended Audience :: Science/Research",
@@ -59,7 +59,7 @@ Sphinx = ">=4.5.0,<5.0.0"
 sphinx-rtd-theme = ">=1.0.0,<2.0.0"
 
 [tool.poetry.scripts]
-vdrv = "scripts.vdrv.vdrv"
+vdrv = "volttron.plugins.vctl.driver.parser:main"
 volttron-platform-driver = "platform_driver.agent:main"
 
 [tool.yapf]
diff --git a/setup_vdrv.py b/setup_vdrv.py
index 13b37cc..ebe5e0c 100644
--- a/setup_vdrv.py
+++ b/setup_vdrv.py
@@ -25,14 +25,14 @@
 from setuptools import setup, find_packages, find_namespace_packages
 
 # Find the agent package that contains the main module
-packages = find_namespace_packages("./scripts")
+packages = find_namespace_packages("./src")
 
 setup(
     name=f"vdrv",
     packages=packages,
-    package_dir={'': 'scripts'},
+    package_dir={'': 'src'},
     entry_points={
-        "console_scripts": [f"vdrv =vdrv.vdrv:main"]
+        "console_scripts": [f"vdrv =volttron.plugins.vctl.driver.parser:main"]
     },
     classifiers=[
         "Development Status :: 3 - Alpha",
diff --git a/scripts/vdrv/__init__.py b/src/volttron/plugins/vctl/driver/__init__.py
similarity index 100%
rename from scripts/vdrv/__init__.py
rename to src/volttron/plugins/vctl/driver/__init__.py
diff --git a/scripts/vdrv/vdrv.py b/src/volttron/plugins/vctl/driver/parser.py
similarity index 100%
rename from scripts/vdrv/vdrv.py
rename to src/volttron/plugins/vctl/driver/parser.py