diff --git a/.gitignore b/.gitignore index 2abff9f9708ccae49116acc9e578626566a58579..9a0a78023e41ac4c67fb1defc83bb75d05b4a941 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 28866d3679c49628d125cdac628ec391e8fd04f7..507881d0f1809ec8570601b3df9bcede1636b922 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 ed4b86010629f467126a28704ef1ba18c853f7a7..c10d07dde5ca7b73be0ffbfc0564724838a144ab 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 0ba2eb8e859809d7712ec745525212cb8c51f675..e9d5fe913c125cea9a77a4082fb2a437efbf52e3 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 4005ad77699ec3aa50f4c39f2c83eb72a43d6436..b2413737ade3d589e727c34ee1736c17222fcece 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 730cc02f6e36f1ac8c023f55e8086d08a1772c55..498798131df030826dc4bc9d002d9211dec33551 100644 --- a/setup.py +++ b/setup.py @@ -8,5 +8,6 @@ setuptools.setup(install_requires=["opcua", "recordclass", "pyyaml", "python-logstash-async", + "importlib-resources", ])