diff --git a/.cruft.json b/.cruft.json index 0f308f1..0ea9ae5 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/DHARPA-Project/kiara_plugin.develop.git", - "commit": "93c09653eb11580d7b56c632cccf3d3cb2594954", + "commit": "a7849bcc8a7aee2b98eaa7fad5505a8784545c78", "checkout": null, "context": { "cookiecutter": { diff --git a/pyproject.toml b/pyproject.toml index 4d632c4..b6d598f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -47,7 +47,7 @@ classifiers = [ "Programming Language :: Python :: 3.12" ] dependencies = [ - "kiara>=0.5.7,<0.6.0", + "kiara>=0.5.8,<0.6.0", "kiara_plugin.core_types>=0.5.0,<0.6.0", "kiara_plugin.tabular>=0.5.1,<0.6.0", ] diff --git a/tests/conftest.py b/tests/conftest.py index 949ca3d..6dba391 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -19,8 +19,8 @@ from kiara.context import KiaraConfig from kiara.interfaces.python_api import KiaraAPI -from kiara.interfaces.python_api.models.job import JobTest -from kiara.utils.testing import get_tests_for_job, list_job_descs +from kiara.interfaces.python_api.models.job import JobDesc, JobTest +from kiara.utils.testing import get_init_job, get_tests_for_job, list_job_descs ROOT_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) JOBS_FOLDER = Path(os.path.join(ROOT_DIR, "examples", "jobs")) @@ -36,6 +36,10 @@ def create_temp_dir(): return instance_path +def get_job_alias(job_desc: JobDesc) -> str: + return job_desc.job_alias + + @pytest.fixture def kiara_api() -> KiaraAPI: @@ -45,7 +49,28 @@ def kiara_api() -> KiaraAPI: return api -@pytest.fixture(params=list_job_descs(JOBS_FOLDER)) +@pytest.fixture +def kiara_api_init_example() -> KiaraAPI: + instance_path = create_temp_dir() + kc = KiaraConfig.create_in_folder(instance_path) + api = KiaraAPI(kc) + + init_job = get_init_job(JOBS_FOLDER) + if init_job is None: + return api + + results = api.run_job(init_job) + + if not init_job.save: + return api + + for field_name, alias_name in init_job.save.items(): + api.store_value(results[field_name], alias_name) + + return api + + +@pytest.fixture(params=list_job_descs(JOBS_FOLDER), ids=get_job_alias) def example_job_test(request, kiara_api) -> JobTest: job_tests_folder = Path(os.path.join(ROOT_DIR, "tests", "job_tests"))