Merge pull request #21 from VisLab/main

Added hedtools to the docs build requirements
hed-standard · Jun 21, 2024 · 11f0edd · 11f0edd
2 parents 4c75fed + 3aef248
commit 11f0edd
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,4 +1,5 @@
 Sphinx>=5.2.2
 myst-parser>=0.18.1
 sphinx-rtd-theme>=1.0.0
-sphinxcontrib-matlabdomain
+sphinxcontrib-matlabdomain
+hedtools>=8.3.0
diff --git a/hedmat/hedtools/HedToolsPython.m b/hedmat/hedtools/HedToolsPython.m
@@ -116,7 +116,7 @@
                 check_for_warnings=checkWarnings);
             if ~isempty(sidecar) && ~isequal(sidecar, py.None)
                 sidecar = HedTools.formatSidecar(sidecar);
-                sidecarObj = py.hed.tools.analysis.annotation_util.strs_to_sidecar(sidecar);
+                sidecarObj = py.hed.tools.strs_to_sidecar(sidecar);
                 issues = sidecarObj.validate(obj.HedSchema, error_handler=ehandler);
                 hasErrors = py.hed.errors.error_reporter.check_for_any_errors(issues);
                 issues = char(py.hed.get_printable_issue_string(issues));
@@ -256,16 +256,14 @@
             % Note this is used as the basis for HED queries or for assembled HED.
             % To manipulate directly in MATLAB -- convert to a cell array of char
             % using string(cell(hedObjs))
-
-            hmod = py.importlib.import_module('hed');
 
-            eventManager = hmod.EventManager(tabular, schema);
+            eventManager = py.hed.tools.EventManager(tabular, schema);
             if removeTypesOn
                 removeTypes = {'Condition-variable', 'Task'};
             else
                 removeTypes = {};
             end
-            tagManager = hmod.HedTagManager(eventManager, ...
+            tagManager = py.hed.tools.HedTagManager(eventManager, ...
                 py.list(removeTypes));
             hedStringObjs = ...
                 tagManager.get_hed_objs(includeContext, replaceDefs);

diff --git a/hedmat/web_services_demos/runAllDemos.m b/hedmat/web_services_demos/runAllDemos.m
@@ -1,6 +1,7 @@
-%host = 'https://hedtools.org/hed';
+host = 'https://hedtools.org/hed';
 %host = 'https://hedtools.org/hed_dev';
-host = 'http://127.0.0.1:5000';
+%host = 'http://127.0.0.1:5000';
+
 
 errorMap = containers.Map('KeyType', 'char', 'ValueType', 'any');
 errorMap('demoGetServices') = demoGetServices(host);

diff --git a/tests/test_hed_tools/TestHedToolsPython.m b/tests/test_hed_tools/TestHedToolsPython.m
@@ -14,7 +14,7 @@
     methods (TestClassSetup)
         function setUp(testCase)
             testCase.hmod = py.importlib.import_module('hed');
-            testCase.hed = HedToolsPython('8.2.0');
+            testCase.hed = HedToolsPython('8.3.0');
             [curDir, ~, ~] = fileparts(mfilename("fullpath"));
             dataPath = fullfile(curDir, filesep, '..', filesep, '..', ...
                 filesep, 'data', filesep);

diff --git a/tests/test_hed_tools/TestHedToolsService.m b/tests/test_hed_tools/TestHedToolsService.m
@@ -13,8 +13,11 @@
     methods (TestClassSetup)
         function setUp(testCase)
             testCase.hed = ...
-                HedToolsService('8.2.0', 'https://hedtools.org/hed_dev');
-                % HedToolsService('8.2.0', 'http://127.0.0.1:5000');
+                HedToolsService('8.2.0', 'https://hedtools.org/hed');
+            % testCase.hed = ...
+            %     HedToolsService('8.2.0', 'https://hedtools.org/hed_dev');
+            % testCase.hed = ...
+            %     HedToolsService('8.2.0', 'http://127.0.0.1:5000');
             [curDir, ~, ~] = fileparts(mfilename("fullpath"));
             dataPath = fullfile(curDir, filesep, '..', filesep, '..', ...
                 filesep, 'data', filesep);