Merge pull request #152 from simleo/rm_engine_version_default

Remove engine version default
ResearchObject · May 30, 2023 · 266aeba · 266aeba
2 parents f5281c1 + 00b70ed
commit 266aeba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/rocrate/model/softwareapplication.py b/rocrate/model/softwareapplication.py
@@ -54,7 +54,6 @@ def version(self, version):
 
 
 PLANEMO_ID = "https://w3id.org/ro/terms/test#PlanemoEngine"
-PLANEMO_DEFAULT_VERSION = "0.74"
 
 
 def planemo(crate):

diff --git a/rocrate/rocrate.py b/rocrate/rocrate.py
@@ -42,7 +42,7 @@
 from .model.computerlanguage import ComputerLanguage, get_lang
 from .model.testinstance import TestInstance
 from .model.testservice import TestService, get_service
-from .model.softwareapplication import SoftwareApplication, get_app, PLANEMO_DEFAULT_VERSION
+from .model.softwareapplication import SoftwareApplication, get_app
 from .model.testsuite import TestSuite
 
 from .utils import is_url, subclasses, get_norm_value, walk
@@ -509,9 +509,6 @@ def add_test_definition(
             self, suite, source=None, dest_path=None, fetch_remote=False, validate_url=False, properties=None,
             engine="planemo", engine_version=None
     ):
-        if engine_version is None:
-            # FIXME: this should be engine-specific
-            engine_version = PLANEMO_DEFAULT_VERSION
         suite = self.__validate_suite(suite)
         definition = self.add(
             TestDefinition(self, source=source, dest_path=dest_path, fetch_remote=fetch_remote,
@@ -523,7 +520,8 @@ def add_test_definition(
             engine = get_app(self, engine)
             self.add(engine)
         definition.engine = engine
-        definition.engineVersion = engine_version
+        if engine_version is not None:
+            definition.engineVersion = engine_version
         suite.definition = definition
         self.metadata.extra_terms.update(TESTING_EXTRA_TERMS)
         return definition

diff --git a/test/test_test_metadata.py b/test/test_test_metadata.py
@@ -243,6 +243,8 @@ def test_add_test_definition(test_data_dir, engine, engine_version):
     assert crate.dereference(PLANEMO) is d.engine
     if engine_version:
         assert d.engineVersion == engine_version
+    else:
+        assert "engineVersion" not in d
 
 
 def test_test_suites_prop(test_data_dir):
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,7 +54,6 @@ def version(self, version):


		PLANEMO_ID = "https://w3id.org/ro/terms/test#PlanemoEngine"
		PLANEMO_DEFAULT_VERSION = "0.74"


		def planemo(crate):
Expand Down