From b8439f7e958a1383337a01bd43a7e015ea86ae94 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Thu, 26 Apr 2018 10:54:59 +0100
Subject: [PATCH] Bumped version support down
---
force_bdss/io/tests/test_workflow_writer.py | 2 +-
force_bdss/io/workflow_reader.py | 2 +-
force_bdss/tests/fixtures/test_empty.json | 2 +-
force_bdss/tests/fixtures/test_null.json | 20 +++++++++++---------
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/force_bdss/io/tests/test_workflow_writer.py b/force_bdss/io/tests/test_workflow_writer.py
index 74a8dbf..f7a0ccc 100644
--- a/force_bdss/io/tests/test_workflow_writer.py
+++ b/force_bdss/io/tests/test_workflow_writer.py
@@ -45,7 +45,7 @@ class TestWorkflowWriter(unittest.TestCase):
self.assertIn("version", result)
self.assertIn("workflow", result)
self.assertIn("mco", result["workflow"])
- self.assertIn("data_sources", result["workflow"])
+ self.assertIn("execution_layers", result["workflow"])
self.assertIn("kpi_calculators", result["workflow"])
def test_write_and_read(self):
diff --git a/force_bdss/io/workflow_reader.py b/force_bdss/io/workflow_reader.py
index 09be4f0..4f0ce4a 100644
--- a/force_bdss/io/workflow_reader.py
+++ b/force_bdss/io/workflow_reader.py
@@ -9,7 +9,7 @@ from ..factory_registry_plugin import IFactoryRegistryPlugin
log = logging.getLogger(__name__)
-SUPPORTED_FILE_VERSIONS = ["1", "2"]
+SUPPORTED_FILE_VERSIONS = ["1"]
class InvalidFileException(Exception):
diff --git a/force_bdss/tests/fixtures/test_empty.json b/force_bdss/tests/fixtures/test_empty.json
index 4984d56..00c6b2f 100644
--- a/force_bdss/tests/fixtures/test_empty.json
+++ b/force_bdss/tests/fixtures/test_empty.json
@@ -2,7 +2,7 @@
"version": "1",
"workflow": {
"mco": null,
- "data_sources": [
+ "execution_layers": [
],
"kpi_calculators": [
],
diff --git a/force_bdss/tests/fixtures/test_null.json b/force_bdss/tests/fixtures/test_null.json
index 8a0a016..4097161 100644
--- a/force_bdss/tests/fixtures/test_null.json
+++ b/force_bdss/tests/fixtures/test_null.json
@@ -8,16 +8,18 @@
]
}
},
- "data_sources": [
- {
- "id": "force.bdss.enthought.factory.test_ds",
- "model_data": {
- "input_slot_maps": [
- ],
- "output_slot_names": [
- ]
+ "execution_layers": [
+ [
+ {
+ "id": "force.bdss.enthought.factory.test_ds",
+ "model_data": {
+ "input_slot_maps": [
+ ],
+ "output_slot_names": [
+ ]
+ }
}
- }
+ ]
],
"kpi_calculators": [
{
--
GitLab