diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..9b38853 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "python.testing.pytestArgs": [ + "tests" + ], + "python.testing.unittestEnabled": false, + "python.testing.pytestEnabled": true +} \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 9104032..0e63e6e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["uv_build >= 0.11.6"] +requires = ["uv_build>=0.11.7,<0.12"] build-backend = "uv_build" [project] diff --git a/src/AuDaGe/formats/controlexpert/builtins.xsy b/src/AuDaGe/formats/controlexpert/data/builtins.xsy similarity index 100% rename from src/AuDaGe/formats/controlexpert/builtins.xsy rename to src/AuDaGe/formats/controlexpert/data/builtins.xsy diff --git a/src/AuDaGe/formats/controlexpert/flatten_datablock.xslt b/src/AuDaGe/formats/controlexpert/data/flatten_datablock.xslt similarity index 100% rename from src/AuDaGe/formats/controlexpert/flatten_datablock.xslt rename to src/AuDaGe/formats/controlexpert/data/flatten_datablock.xslt diff --git a/src/AuDaGe/formats/controlexpert/flatten_ddtsource.xslt b/src/AuDaGe/formats/controlexpert/data/flatten_ddtsource.xslt similarity index 100% rename from src/AuDaGe/formats/controlexpert/flatten_ddtsource.xslt rename to src/AuDaGe/formats/controlexpert/data/flatten_ddtsource.xslt diff --git a/src/AuDaGe/formats/controlexpert/xsy.py b/src/AuDaGe/formats/controlexpert/xsy.py index 1f2a6cf..6c95982 100644 --- a/src/AuDaGe/formats/controlexpert/xsy.py +++ b/src/AuDaGe/formats/controlexpert/xsy.py @@ -1,6 +1,7 @@ import os import sys from collections.abc import Sequence +from importlib import resources import pandas as pd from pandas import DataFrame @@ -35,13 +36,17 @@ class XSY(): xsy_path: os.path, dir_path: os.path = '', def_paths: Sequence[os.path] = [], - db_ss_path: os.path = 'flatten_datablock.xslt', - ddt_ss_path: os.path = 'flatten_ddtsource.xslt', + db_ss_path: os.path = 'data/flatten_datablock.xslt', + ddt_ss_path: os.path = 'data/flatten_ddtsource.xslt', ) -> None: self.dir_path: os.path = dir_path self.xsy_path: os.path = os.path.join(dir_path, xsy_path) - self.db_ss_path: os.path = os.path.join(dir_path, db_ss_path) - self.ddt_ss_path: os.path = os.path.join(dir_path, ddt_ss_path) + self.db_ss_path: os.path = resources.files( + "AuDaGe.formats.controlexpert.xsy" + ).joinpath(db_ss_path) + self.ddt_ss_path: os.path = resources.files( + "AuDaGe.formats.controlexpert.xsy" + ).joinpath(ddt_ss_path) self.def_paths: list[os.path] = [ os.path.join(dir_path, def_path) for def_path in def_paths ] diff --git a/tests/xsy/filter_master.xsy b/tests/data/filter_master.xsy similarity index 100% rename from tests/xsy/filter_master.xsy rename to tests/data/filter_master.xsy diff --git a/tests/xsy/hsps.xsy b/tests/data/hsps.xsy similarity index 100% rename from tests/xsy/hsps.xsy rename to tests/data/hsps.xsy diff --git a/tests/test_xsy.py b/tests/test_xsy.py new file mode 100644 index 0000000..520bc62 --- /dev/null +++ b/tests/test_xsy.py @@ -0,0 +1,9 @@ +from pandas import DataFrame +from AuDaGe.formats.controlexpert.xsy import XSY + +def test_init(): + assert isinstance(XSY("tests/data/hsps.xsy"), XSY) + +def test_read_datablock(): + xsy = XSY("tests/data/hsps.xsy") + assert isinstance(xsy.read_datablock(), DataFrame) \ No newline at end of file diff --git a/tests/xsy/xsy.py b/tests/xsy/xsy.py deleted file mode 100644 index 575dd6c..0000000 --- a/tests/xsy/xsy.py +++ /dev/null @@ -1,3 +0,0 @@ -from AuDaGe.formats.controlexpert.xsy import XSY - -print(XSY("hsps.xsy")) \ No newline at end of file