Commit fb90d9ef authored by Sylvain Guieu's avatar Sylvain Guieu

share dict fix, dev3

parent dc35a0a7
import os
import sys
config_path = []
## by default look in the share directory
__module_dir__, _ = os.path.split(__file__)
__package_dir__, __pkg__ = os.path.split(__module_dir__)
config_path.append(os.path.join(__package_dir__, "share", __pkg__, "config"))
config_path.append(os.path.join(sys.prefix, "share", __pkg__, "config"))
# found the lib package and look for a share directory at same level
while __package_dir__:
__package_dir__, __s__ = os.path.split(__package_dir__)
if __s__ == "lib":
config_path.append(os.path.join(__package_dir__, "share", __pkg__, "config"))
# also include the module/config directory in case it was not installed py setup.py
config_path.append(os.path.join(__module_dir__, "config"))
......
from . import keys as K
from ..io import ioconfig
#### ################################
#
# Function to load the devices yaml files.
......@@ -87,7 +86,7 @@ class Int(FType):
return value
add_ftype(Int)
def load_device_conf(file_name):
def load_device_conf(file_name):
conf_fields = ioconfig.load_yaml(file_name)
fields = {}
......
......@@ -7,7 +7,7 @@ import sys
from setuptools import setup
name = "hrmtools"
version='0.1.dev2' # https://www.python.org/dev/peps/pep-0440/
version='0.1.dev3' # https://www.python.org/dev/peps/pep-0440/
author='Sylvain Guieu'
author_email='sylvain.guieu@univ-grenoble-alpes.fr'
install_requires = ['yaml-1.3', 'openpyxl>=3.0']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment