From 1233c66fe1b4445402c69213e07f3d5697def90f Mon Sep 17 00:00:00 2001 From: ndaelman Date: Thu, 21 Nov 2024 15:29:26 +0100 Subject: [PATCH 1/4] Remove dependency links to git branches --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c52081a..f5f53d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,8 +23,8 @@ homepage = "https://github.com/nomad-coe/nomad-schema-plugin-simulation-workflow [tool.uv] dev-dependencies = [ - "nomad-normalizer-plugin-bandstructure@git+https://github.com/nomad-coe/nomad-normalizer-plugin-bandstructure.git@develop", - "nomad-normalizer-plugin-system@git+https://github.com/nomad-coe/nomad-normalizer-plugin-system.git@develop", + "nomad-normalizer-plugin-bandstructure", + "nomad-normalizer-plugin-system", 'mypy==1.0.1', 'pytest>= 5.3.0, <8', 'pytest-timeout>=1.4.2', From bc06fd1a715860d92e2526afe3c2db8963d82f67 Mon Sep 17 00:00:00 2001 From: ndaelman Date: Thu, 21 Nov 2024 15:57:07 +0100 Subject: [PATCH 2/4] Remove `importlib` dependency --- simulationworkflowschema/__init__.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/simulationworkflowschema/__init__.py b/simulationworkflowschema/__init__.py index fe854e8..4210c0b 100644 --- a/simulationworkflowschema/__init__.py +++ b/simulationworkflowschema/__init__.py @@ -94,13 +94,6 @@ def load_modules(): 'photon_polarization', 'thermodynamics', ] - import simulationworkflowschema - - for name in sub_modules: - sub_module = importlib.import_module(f'simulationworkflowschema.{name}') - for method in sub_module.__dict__: - if method in __all__: - setattr(simulationworkflowschema, method, sub_module.__dict__[method]) class SimulationWorkflowSchemaEntryPoint(SchemaPackageEntryPoint): From a14cc38b14a90c7e722c682a7b3cbce549396041 Mon Sep 17 00:00:00 2001 From: jrudz Date: Fri, 13 Dec 2024 16:49:50 +0100 Subject: [PATCH 3/4] put back import hack --- simulationworkflowschema/__init__.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/simulationworkflowschema/__init__.py b/simulationworkflowschema/__init__.py index 4210c0b..719c0a7 100644 --- a/simulationworkflowschema/__init__.py +++ b/simulationworkflowschema/__init__.py @@ -94,7 +94,13 @@ def load_modules(): 'photon_polarization', 'thermodynamics', ] + import simulationworkflowschema + for name in sub_modules: + sub_module = importlib.import_module(f'simulationworkflowschema.{name}') + for method in sub_module.__dict__: + if method in __all__: + setattr(simulationworkflowschema, method, sub_module.__dict__[method]) class SimulationWorkflowSchemaEntryPoint(SchemaPackageEntryPoint): def load(self): From 973878f34ffe82e8faeae140c4be022c7fa18d3f Mon Sep 17 00:00:00 2001 From: jrudz Date: Fri, 13 Dec 2024 16:58:30 +0100 Subject: [PATCH 4/4] again the hack --- simulationworkflowschema/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/simulationworkflowschema/__init__.py b/simulationworkflowschema/__init__.py index 719c0a7..fe854e8 100644 --- a/simulationworkflowschema/__init__.py +++ b/simulationworkflowschema/__init__.py @@ -102,6 +102,7 @@ def load_modules(): if method in __all__: setattr(simulationworkflowschema, method, sub_module.__dict__[method]) + class SimulationWorkflowSchemaEntryPoint(SchemaPackageEntryPoint): def load(self): load_modules()