rdf module moved to wrapper

matthiasprobst · Apr 21, 2024 · 8fdf264 · 8fdf264
1 parent 22d106d
commit 8fdf264
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/h5rdmtoolbox/_repr.py b/h5rdmtoolbox/_repr.py
@@ -14,7 +14,7 @@
 from ontolutils import M4I, Thing
 
 from . import get_config, identifiers, protected_attributes
-from .convention.rdf import RDF_SUBJECT_ATTR_NAME, RDF_PREDICATE_ATTR_NAME, RDF_OBJECT_ATTR_NAME
+from h5rdmtoolbox.wrapper.rdf import RDF_SUBJECT_ATTR_NAME, RDF_PREDICATE_ATTR_NAME, RDF_OBJECT_ATTR_NAME
 
 H5PY_SPECIAL_ATTRIBUTES = ('DIMENSION_LIST', 'REFERENCE_LIST', 'NAME', 'CLASS', protected_attributes.COORDINATES)
 try:

diff --git a/h5rdmtoolbox/utils.py b/h5rdmtoolbox/utils.py
@@ -21,7 +21,7 @@
 
 from . import _user, get_config, get_ureg
 from ._version import __version__
-from .convention import rdf
+from .wrapper import rdf
 
 logger = logging.getLogger('h5rdmtoolbox')
 DEFAULT_LOGGING_LEVEL = logging.INFO

diff --git a/h5rdmtoolbox/wrapper/core.py b/h5rdmtoolbox/wrapper/core.py
@@ -23,15 +23,14 @@
 from h5rdmtoolbox.database import ObjDB
 from h5rdmtoolbox.database.lazy import LHDFObject
 # noinspection PyUnresolvedReferences
-from . import xr2hdf
+from . import xr2hdf, rdf
 from .ds_decoder import dataset_value_decoder
 from .h5attr import H5_DIM_ATTRS, pop_hdf_attributes, WrapperAttributeManager
 from .h5utils import _is_not_valid_natural_name, get_rootparent
 from .. import _repr, get_config, convention, utils, consts, protected_attributes
 from .. import get_ureg
 from .._repr import H5Repr, H5PY_SPECIAL_ATTRIBUTES
 from ..convention import definition
-from ..convention import rdf
 from ..convention.consts import DefaultValue
 
 logger = logging.getLogger('h5rdmtoolbox')

diff --git a/h5rdmtoolbox/convention/rdf.py → h5rdmtoolbox/wrapper/rdf.py b/h5rdmtoolbox/convention/rdf.py → h5rdmtoolbox/wrapper/rdf.py
diff --git a/tests/wrapper/test_jsonld.py b/tests/wrapper/test_jsonld.py
@@ -10,10 +10,9 @@
 
 import h5rdmtoolbox as h5tbx
 from h5rdmtoolbox import __version__
-from h5rdmtoolbox.convention import rdf
 from h5rdmtoolbox.convention.hdf_ontology import HDF5
-from h5rdmtoolbox.convention.rdf import RDF_SUBJECT_ATTR_NAME
-from h5rdmtoolbox.wrapper import jsonld
+from h5rdmtoolbox.wrapper.rdf import RDF_SUBJECT_ATTR_NAME
+from h5rdmtoolbox.wrapper import jsonld, rdf
 from h5rdmtoolbox.wrapper.jsonld import build_node_list
 
 logger = h5tbx.logger

diff --git a/tests/wrapper/test_rdf.py b/tests/wrapper/test_rdf.py
@@ -8,8 +8,8 @@
 from h5rdmtoolbox import Attribute
 from h5rdmtoolbox import jsonld
 from h5rdmtoolbox import use
-from h5rdmtoolbox.convention.rdf import RDFError
-from h5rdmtoolbox.convention.rdf import RDF_PREDICATE_ATTR_NAME
+from h5rdmtoolbox.wrapper.rdf import RDFError
+from h5rdmtoolbox.wrapper.rdf import RDF_PREDICATE_ATTR_NAME
 from h5rdmtoolbox.wrapper.h5attr import AttrDescriptionError