From 760bf33763dbffb86ba9b3b3a2457fb08852f48a Mon Sep 17 00:00:00 2001
From: Hannes Feldt <feldt@astron.nl>
Date: Tue, 8 Oct 2024 10:13:00 +0200
Subject: [PATCH] fix
---
pypcc/pypcc.py | 2 +-
pypcc/yamlconfig.py | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/pypcc/pypcc.py b/pypcc/pypcc.py
index 29b1053..dcbaba6 100755
--- a/pypcc/pypcc.py
+++ b/pypcc/pypcc.py
@@ -78,7 +78,7 @@ def main():
opcuaserv.AddVarR("TR_software_version_R",git_hash+"_"+args.config,[],False)
for i,name in enumerate(I2Cports):
RCU_I2C=I2Cclients[i]
- RCU_conf=yamlreader.yamlreader(RCU_I2C,yamlfile=f"/etc/hwtr/{name}.yaml")
+ RCU_conf=yamlreader.yamlreader(RCU_I2C,yamlfile=name)
RCU_conf.AddVars(opcuaserv.AddVarR,opcuaserv.AddVarW)
RCU_conf.AddMethod(opcuaserv.Addmethod)
RCU_conf.CallInit();
diff --git a/pypcc/yamlconfig.py b/pypcc/yamlconfig.py
index 24f927b..a7d582d 100644
--- a/pypcc/yamlconfig.py
+++ b/pypcc/yamlconfig.py
@@ -32,8 +32,7 @@ class yamlconfig():
if yamlfile.split('.')[-1]=='yaml':
self.conf=yaml.load(open(yamlfile), Loader=yaml.FullLoader)
else:
- pkg = importlib_resources.files("pypcc")
- pkg_data_file = pkg / "config" / (yamlfile+'.yaml')
+ pkg_data_file = "/etc/hwtr/" + (yamlfile+'.yaml')
self.conf=yaml.load(pkg_data_file.open(), Loader=yaml.FullLoader)
self.expand_variables()
# print([[v['name'],v.get('devreg')] for v in var1])
--
GitLab