From b158048e29b444dc1c5362d1f9eedf837ece4965 Mon Sep 17 00:00:00 2001 From: Jonathan Karr Date: Tue, 5 Jan 2021 03:58:15 -0500 Subject: [PATCH] updating to biosimulators-utils 0.1.30, incrementing version --- Dockerfile | 2 +- biosimulators_copasi/_version.py | 2 +- biosimulators_copasi/core.py | 5 ++++- requirements.txt | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a2bd221..c92442a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ # Base OS FROM python:3.7.9-slim-buster -ARG VERSION="0.1.12" +ARG VERSION="0.1.13" ARG SIMULATOR_VERSION=4.30.233 # metadata diff --git a/biosimulators_copasi/_version.py b/biosimulators_copasi/_version.py index e6d0c4f..377e1f6 100644 --- a/biosimulators_copasi/_version.py +++ b/biosimulators_copasi/_version.py @@ -1 +1 @@ -__version__ = '0.1.12' +__version__ = '0.1.13' diff --git a/biosimulators_copasi/core.py b/biosimulators_copasi/core.py index 3f2b53f..00af806 100644 --- a/biosimulators_copasi/core.py +++ b/biosimulators_copasi/core.py @@ -13,9 +13,11 @@ from biosimulators_utils.sedml.data_model import (Task, ModelLanguage, UniformTimeCourseSimulation, # noqa: F401 DataGeneratorVariable, DataGeneratorVariableSymbol) from biosimulators_utils.sedml import validation +from biosimulators_utils.sedml.exec import exec_sed_doc from .data_model import KISAO_ALGORITHMS_MAP from .utils import get_algorithm_id, set_algorithm_parameter_value import COPASI +import functools import math import numpy import warnings @@ -43,7 +45,8 @@ def exec_sedml_docs_in_combine_archive(archive_filename, out_dir, bundle_outputs (:obj:`bool`, optional): if :obj:`True`, bundle outputs into archives for reports and plots keep_individual_outputs (:obj:`bool`, optional): if :obj:`True`, keep individual output files """ - exec_sedml_docs_in_archive(archive_filename, exec_sed_task, out_dir, + sed_doc_executer = functools.partial(exec_sed_doc, exec_sed_task) + exec_sedml_docs_in_archive(sed_doc_executer, archive_filename, out_dir, apply_xml_model_changes=True, report_formats=report_formats, plot_formats=plot_formats, diff --git a/requirements.txt b/requirements.txt index a888e91..d84f481 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -biosimulators_utils >= 0.1.28 +biosimulators_utils >= 0.1.30 numpy python_copasi >= 4.30.233