From 32edf38e5e0d2f99b47ad1a09073f663b724fecd Mon Sep 17 00:00:00 2001
From: kruger <kruger@astron.nl>
Date: Mon, 11 Apr 2022 17:21:12 +0200
Subject: [PATCH] library bugs fixed
---
.gitignore | 3 +++
pypcc/i2cserv/hbat2_array.py | 2 +-
pypcc/i2cserv/i2c_array.py | 2 +-
pypcc/i2cserv/i2c_dev.py | 2 +-
pypcc/yamlconfig.py | 6 +++++-
setup.py | 1 +
6 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2abff9f..9a0a780 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
**/__pycache__
**/*.pyc
**/.DS_Store
+build/*
+dist/*
+pypcc.egg-info/*
\ No newline at end of file
diff --git a/pypcc/i2cserv/hbat2_array.py b/pypcc/i2cserv/hbat2_array.py
index 28866d3..507881d 100644
--- a/pypcc/i2cserv/hbat2_array.py
+++ b/pypcc/i2cserv/hbat2_array.py
@@ -1,6 +1,6 @@
import numpy as np
import logging
-from queuetypes import *
+from pypcc.queuetypes import *
from .hwdev import hwdev
from .i2c_dev import i2c_dev
diff --git a/pypcc/i2cserv/i2c_array.py b/pypcc/i2cserv/i2c_array.py
index ed4b860..c10d07d 100644
--- a/pypcc/i2cserv/i2c_array.py
+++ b/pypcc/i2cserv/i2c_array.py
@@ -1,7 +1,7 @@
import numpy as np
import logging
from .spibitbang1 import spibitbang1
-from queuetypes import *
+from pypcc.queuetypes import *
from .hwdev import hwdev
from .i2c_dev import *
diff --git a/pypcc/i2cserv/i2c_dev.py b/pypcc/i2cserv/i2c_dev.py
index 0ba2eb8..e9d5fe9 100644
--- a/pypcc/i2cserv/i2c_dev.py
+++ b/pypcc/i2cserv/i2c_dev.py
@@ -1,7 +1,7 @@
import numpy as np
import logging
from .spibitbang1 import spibitbang1
-from queuetypes import *
+from pypcc.queuetypes import *
from .hwdev import hwdev
def ApplyMask(value,width=8,bitoffset=0,previous=0):
diff --git a/pypcc/yamlconfig.py b/pypcc/yamlconfig.py
index 4005ad7..b241373 100644
--- a/pypcc/yamlconfig.py
+++ b/pypcc/yamlconfig.py
@@ -2,7 +2,11 @@ import yaml
import struct
import time
import logging
-import importlib.resources as importlib_resources
+import sys
+if sys.version_info < (3,9):
+ import importlib_resources
+else:
+ import importlib.resources as importlib_resources
def Find(L,name,value,default=False):
for x in L:
diff --git a/setup.py b/setup.py
index 730cc02..4987981 100644
--- a/setup.py
+++ b/setup.py
@@ -8,5 +8,6 @@ setuptools.setup(install_requires=["opcua",
"recordclass",
"pyyaml",
"python-logstash-async",
+ "importlib-resources",
])
--
GitLab