Merge branch 'dev' into deploy

biosimulators · Dec 14, 2021 · d14cb83 · d14cb83
2 parents 29b0d35 + 7d5e196
commit d14cb83
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -6,18 +6,18 @@
 
 # BioSimulators test suite
 
-The BioSimulators test suite is a tool for validating that biosimulation software tools implement the [BioSimulators conventions for biosimulation tools](https://biosimulators.org/conventions).
+The BioSimulators test suite is a tool for validating that biosimulation software tools implement the [BioSimulators conventions for biosimulation tools](https://docs.biosimulations.org/concepts/conventions/).
 
 The test suite is composed of two parts:
 
 * [A collection of example modeling projects](examples). Each project is represented by a single [COMBINE/OMEX archive](https://combinearchive.org/) that contains one or more simulation experiments described using the [Simulation Experiment Description Markup Language (SED-ML)](https://sed-ml.org) and one or more models described using a format such as the [BioNetGen Language (BNGL)](https://bionetgen.org) or the [Systems Biology Markup Language (SBML)](http://sbml.org).
 
 * Software for checking that biosimulation tools execute these projects according to the BioSimulators conventions.
 
-    * Simulation tools support the [BioSimulators standard command-line arguments](https://biosimulators.org/conventions/simulator-interfaces).
-    * Simulation tools support the [BioSimulators conventions for Docker images](https://biosimulators.org/conventions/simulator-images).
-    * Simulation tools follow the [BioSimulators conventions for executing simulations described by SED-ML files in COMBINE/OMEX archives](https://biosimulators.org/conventions/simulation-experiments).
-    * Simulation tools support the [BioSimulators conventions for the outputs of SED-ML files in COMBINE/OMEX archives](https://biosimulators.org/conventions/simulation-reports).
+    * Simulation tools support the [BioSimulators standard command-line arguments](https://docs.biosimulations.org/concepts/conventions/simulator-interfaces/).
+    * Simulation tools support the [BioSimulators conventions for Docker images](https://docs.biosimulations.org/concepts/conventions/simulator-images/).
+    * Simulation tools follow the [BioSimulators conventions for executing simulations described by SED-ML files in COMBINE/OMEX archives](https://docs.biosimulations.org/concepts/conventions/simulation-experiments/).
+    * Simulation tools support the [BioSimulators conventions for the outputs of SED-ML files in COMBINE/OMEX archives](https://docs.biosimulations.org/concepts/conventions/simulation-run-reports/).
 
 ## Installation instructions, tutorial, and API documentation
 Installation instructions, tutorial, and API documentation are available [here](https://docs.biosimulators.org/Biosimulators_test_suite/).

diff --git a/biosimulators_test_suite/_version.py b/biosimulators_test_suite/_version.py
@@ -1 +1 @@
-__version__ = '0.1.79'
+__version__ = '0.1.80'
diff --git a/biosimulators_test_suite/test_case/docker_image.py b/biosimulators_test_suite/test_case/docker_image.py
@@ -48,7 +48,7 @@ def eval(self, specifications, working_dirname, synthetic_archives_dir=None, dry
                    "Compatability with Singularity is important for using the image on HPC systems, including "
                    "the infrastructure used by runBioSimulations and BioSimulations.\n\n"
                    "More information:\n"
-                   "  https://biosimulators.org/conventions/simulator-images\n"
+                   "  https://docs.biosimulations.org/concepts/conventions/simulator-images/\n"
                    "  https://sylabs.io/guides/3.7/user-guide/singularity_and_docker.html#best-practices"
                    ).format(user)
             warnings.warn(msg, TestCaseWarning)

diff --git a/biosimulators_test_suite/test_case/log.py b/biosimulators_test_suite/test_case/log.py
@@ -64,7 +64,7 @@ def eval_outputs(self, specifications, synthetic_archive, synthetic_sed_docs, ou
             msg = (
                 'The simulator did not export information about the status of its execution. '
                 'Simulators are encouraged to stream information about their execution status.\n\n'
-                'More information: https://biosimulators.org/conventions/status'
+                'More information: https://docs.biosimulations.org/concepts/conventions/simulation-run-logs/'
             )
             raise SkippedTestCaseException(msg)
 
@@ -85,7 +85,7 @@ def eval_outputs(self, specifications, synthetic_archive, synthetic_sed_docs, ou
             except requests.exceptions.HTTPError:
                 msg = (
                     'The simulation log is invalid. Documentation about the log format is available at '
-                    'https://biosimulators.org/conventions and https://api.biosimulators.org.'
+                    'https://docs.biosimulations.org/concepts/conventions/simulation-run-logs/ and https://api.biosimulations.org.'
                 )
                 error = response.json()['error'][0]
 

diff --git a/docs-src/index.rst b/docs-src/index.rst
@@ -1,18 +1,18 @@
 BioSimulators test suite documentation
 ===========================================
 
-The BioSimulators test suite is a tool for validating that biosimulation software tools implement the `BioSimulators conventions for biosimulation tools <https://biosimulators.org/conventions>`_.
+The BioSimulators test suite is a tool for validating that biosimulation software tools implement the `BioSimulators conventions for biosimulation tools <https://docs.biosimulations.org/concepts/conventions/>`_.
 
 The test suite is composed of two parts:
 
 * A collection of example modeling projects. Each project is represented by a single `COMBINE/OMEX archive <https://combinearchive.org/>`_ that contains one or more simulation experiments described using the `Simulation Experiment Description Markup Language (SED-ML) <https://sed-ml.org>`_ and one or more models described using a format such as the `BioNetGen Language (BNGL) <https://bionetgen.org>`_) or the `Systems Biology Markup Language (SBML) <http://sbml.org>`_.
 
 * Software for checking that biosimulation tools execute these projects according to the BioSimulators conventions.
 
-    * Simulation tools support the `BioSimulators standard command-line arguments <https://biosimulators.org/conventions/simulator-interfaces>`_.
-    * Simulation tools support the `BioSimulators conventions for Docker images <https://biosimulators.org/conventions/simulator-images>`_.
-    * Simulation tools follow the `BioSimulators conventions for executing simulations described by SED-ML files in COMBINE/OMEX archives <https://biosimulators.org/conventions/simulation-experiments>`_.
-    * Simulation tools support the `BioSimulators conventions for the outputs of SED-ML files in COMBINE/OMEX archives <https://biosimulators.org/conventions/simulation-reports>`_.
+    * Simulation tools support the `BioSimulators standard command-line arguments <https://docs.biosimulations.org/concepts/conventions/simulator-interfaces/>`_.
+    * Simulation tools support the `BioSimulators conventions for Docker images <https://docs.biosimulations.org/concepts/conventions/simulator-images/>`_.
+    * Simulation tools follow the `BioSimulators conventions for executing simulations described by SED-ML files in COMBINE/OMEX archives <https://docs.biosimulations.org/concepts/conventions/simulation-experiments/>`_.
+    * Simulation tools support the `BioSimulators conventions for the outputs of SED-ML files in COMBINE/OMEX archives <https://docs.biosimulations.org/concepts/conventions/simulation-run-reports/>`_.
 
 Contents
 --------