Merge branch 'dev' into deploy

biosimulators · Oct 15, 2021 · 0d28a47 · 0d28a47
2 parents 4970f3e + cadfa26
commit 0d28a47
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 9 deletions.
diff --git a/biosimulators_test_suite/_version.py b/biosimulators_test_suite/_version.py
@@ -1 +1 @@
-__version__ = '0.1.67'
+__version__ = '0.1.68'
diff --git a/biosimulators_test_suite/test_case/docker_image.py b/biosimulators_test_suite/test_case/docker_image.py
@@ -124,7 +124,7 @@ def eval(self, specifications, working_dirname, synthetic_archives_dir=None, dry
         image = self.get_simulator_docker_image(specifications)
         missing_labels = set(self.EXPECTED_LABELS).difference(set(image.labels.keys()))
         if missing_labels:
-            warnings.warn('The Docker image should have the following Open Container Initiative (OCI) labels:\n  {}'.format(
+            warnings.warn('Docker images are encouraged to have the following Open Container Initiative (OCI) labels:\n  {}'.format(
                 '\n  '.join(sorted(missing_labels))), TestCaseWarning)
 
 
@@ -165,7 +165,7 @@ def eval(self, specifications, working_dirname, synthetic_archives_dir=None, dry
         image = self.get_simulator_docker_image(specifications)
         missing_labels = set(self.EXPECTED_LABELS).difference(set(image.labels.keys()))
         if missing_labels:
-            warnings.warn('The Docker image should have the following BioContainers labels:\n  {}'.format(
+            warnings.warn('Docker images are encouraged to have the following BioContainers labels:\n  {}'.format(
                 '\n  '.join(sorted(missing_labels))), TestCaseWarning)
 
 

diff --git a/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock-continuous.omex b/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock-continuous.omex
diff --git a/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock-continuous/manifest.xml b/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock-continuous/manifest.xml
@@ -6,5 +6,5 @@
   <content location="metadata.rdf" format="http://identifiers.org/combine.specifications/omex-metadata" master="false"/>
   <content location="expected-results.json" format="http://purl.org/NET/mediatypes/application/json" master="false"/>
   <content location="reports.h5" format="http://purl.org/NET/mediatypes/application/x-hdf" master="false"/>
-  <content location="Figure1.jpg" format="http://purl.org/NET/mediatypes/images/jpeg" master="false"/>
+  <content location="Figure1.jpg" format="http://purl.org/NET/mediatypes/image/jpeg" master="false"/>
 </omexManifest>
diff --git a/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock-discrete-NRM.omex b/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock-discrete-NRM.omex
diff --git a/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock-discrete-NRM/manifest.xml b/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock-discrete-NRM/manifest.xml
@@ -6,5 +6,5 @@
   <content location="metadata.rdf" format="http://identifiers.org/combine.specifications/omex-metadata" master="false"/>
   <content location="expected-results.json" format="http://purl.org/NET/mediatypes/application/json" master="false"/>
   <content location="reports.h5" format="http://purl.org/NET/mediatypes/application/x-hdf" master="false"/>
-  <content location="Figure1.jpg" format="http://purl.org/NET/mediatypes/images/jpeg" master="false"/>
+  <content location="Figure1.jpg" format="http://purl.org/NET/mediatypes/image/jpeg" master="false"/>
 </omexManifest>
diff --git a/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock-discrete-SSA.omex b/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock-discrete-SSA.omex
diff --git a/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock-discrete-SSA/manifest.xml b/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock-discrete-SSA/manifest.xml
@@ -6,5 +6,5 @@
   <content location="metadata.rdf" format="http://identifiers.org/combine.specifications/omex-metadata" master="false"/>
   <content location="expected-results.json" format="http://purl.org/NET/mediatypes/application/json" master="false"/>
   <content location="reports.h5" format="http://purl.org/NET/mediatypes/application/x-hdf" master="false"/>
-  <content location="Figure1.jpg" format="http://purl.org/NET/mediatypes/images/jpeg" master="false"/>
+  <content location="Figure1.jpg" format="http://purl.org/NET/mediatypes/image/jpeg" master="false"/>
 </omexManifest>
diff --git a/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock.omex b/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock.omex
diff --git a/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock/manifest.xml b/examples/sbml-core/Vilar-PNAS-2002-minimal-circardian-clock/manifest.xml
@@ -7,5 +7,5 @@
   <content location="metadata.rdf" format="http://identifiers.org/combine.specifications/omex-metadata" master="false"/>
   <content location="expected-results.json" format="http://purl.org/NET/mediatypes/application/json" master="false"/>
   <content location="reports.h5" format="http://purl.org/NET/mediatypes/application/x-hdf" master="false"/>
-  <content location="Figure1.jpg" format="http://purl.org/NET/mediatypes/images/jpeg" master="false"/>
+  <content location="Figure1.jpg" format="http://purl.org/NET/mediatypes/image/jpeg" master="false"/>
 </omexManifest>
diff --git a/tests/test_case/test_docker_image.py b/tests/test_case/test_docker_image.py
@@ -33,13 +33,13 @@ def test_DeclaresSupportedEnvironmentVariables(self):
     def test_HasOciLabels(self):
         case = docker_image.HasOciLabels()
         case.eval({'image': {'url': self.IMAGE}}, self.dirname)
-        with self.assertWarnsRegex(TestCaseWarning, 'should have the following'):
+        with self.assertWarnsRegex(TestCaseWarning, 'are encouraged to have the following'):
             case.eval({'image': {'url': 'hello-world'}}, self.dirname)
 
     def test_HasBioContainersLabels(self):
         case = docker_image.HasBioContainersLabels()
         case.eval({'image': {'url': self.IMAGE}}, self.dirname)
-        with self.assertWarnsRegex(TestCaseWarning, 'should have the following'):
+        with self.assertWarnsRegex(TestCaseWarning, 'are encouraged to have the following'):
             case.eval({'image': {'url': 'hello-world'}}, self.dirname)
 
     def test_SingularityImageExecutesSimulationsSuccessfully(self):