From d443e2271e4cbf9a3dea4237551f38db01777c97 Mon Sep 17 00:00:00 2001 From: cortadocodes Date: Wed, 21 Apr 2021 20:55:31 +0100 Subject: [PATCH 1/3] IMP: Change tags serialisation to a list of strings --- tests/data/apps/example_app/twine.json | 2 +- tests/test_manifest_strands.py | 18 +++++++++--------- twined/schema/manifest_schema.json | 15 +++++++++++++-- twined/schema/twine_schema.json | 8 ++++++-- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/tests/data/apps/example_app/twine.json b/tests/data/apps/example_app/twine.json index 394833d..a86ee38 100644 --- a/tests/data/apps/example_app/twine.json +++ b/tests/data/apps/example_app/twine.json @@ -60,7 +60,7 @@ { "key": "production_data", "purpose": "A dataset containing production data", - "tags": "production, wind" + "tags": ["production", "wind"] } ], "output_values_schema": { diff --git a/tests/test_manifest_strands.py b/tests/test_manifest_strands.py index 8da4190..5ca0bb0 100644 --- a/tests/test_manifest_strands.py +++ b/tests/test_manifest_strands.py @@ -62,14 +62,14 @@ def test_valid_manifest_files(self): { "id": "34ad7669-8162-4f64-8cd5-4abe92509e17", "name": "my configuration dataset", - "tags": "the, config, tags", + "tags": ["the", "config", "tags"], "files": [ { "path": "configuration/datasets/7ead7669/file_1.csv", "cluster": 0, "sequence": 0, "extension": "csv", - "tags": "", + "tags": [], "posix_timestamp": 0, "id": "abff07bc-7c19-4ed5-be6d-a6546eae8e86", "last_modified": "2019-02-28T22:40:30.533005Z", @@ -82,7 +82,7 @@ def test_valid_manifest_files(self): "cluster": 0, "sequence": 1, "extension": "csv", - "tags": "", + "tags": [], "posix_timestamp": 0, "id": "bbff07bc-7c19-4ed5-be6d-a6546eae8e45", "last_modified": "2019-02-28T22:40:40.633001Z", @@ -103,14 +103,14 @@ def test_valid_manifest_files(self): { "id": "7ead7669-8162-4f64-8cd5-4abe92509e17", "name": "my meteorological dataset", - "tags": "met, mast, wind", + "tags": ["met", "mast", "wind"], "files": [ { "path": "input/datasets/7ead7669/file_1.csv", "cluster": 0, "sequence": 0, "extension": "csv", - "tags": "", + "tags": [], "posix_timestamp": 0, "id": "abff07bc-7c19-4ed5-be6d-a6546eae8e86", "last_modified": "2019-02-28T22:40:30.533005Z", @@ -123,7 +123,7 @@ def test_valid_manifest_files(self): "cluster": 0, "sequence": 1, "extension": "csv", - "tags": "", + "tags": [], "posix_timestamp": 0, "id": "bbff07bc-7c19-4ed5-be6d-a6546eae8e45", "last_modified": "2019-02-28T22:40:40.633001Z", @@ -144,14 +144,14 @@ def test_valid_manifest_files(self): { "id": "1ead7669-8162-4f64-8cd5-4abe92509e17", "name": "my output dataset", - "tags": "the, output, tags", + "tags": ["the", "output", "tags"], "files": [ { "path": "input/datasets/7ead7669/file_1.csv", "cluster": 0, "sequence": 0, "extension": "csv", - "tags": "", + "tags": [], "posix_timestamp": 0, "id": "abff07bc-7c19-4ed5-be6d-a6546eae8e86", "last_modified": "2019-02-28T22:40:30.533005Z", @@ -164,7 +164,7 @@ def test_valid_manifest_files(self): "cluster": 0, "sequence": 1, "extension": "csv", - "tags": "", + "tags": [], "posix_timestamp": 0, "id": "bbff07bc-7c19-4ed5-be6d-a6546eae8e45", "last_modified": "2019-02-28T22:40:40.633001Z", diff --git a/twined/schema/manifest_schema.json b/twined/schema/manifest_schema.json index 2e72694..ebbf19b 100644 --- a/twined/schema/manifest_schema.json +++ b/twined/schema/manifest_schema.json @@ -34,7 +34,12 @@ }, "tags": { "description": "Textual tags associated with the dataset", - "type": "string" + "type": "array", + "items": [ + { + "type": "string" + } + ] }, "files": { "description": "Textual tags associated with the manifest", @@ -67,7 +72,13 @@ "type": "number" }, "tags": { - "description": "Textual tags associated with the file" + "description": "Textual tags associated with the file", + "type": "array", + "items": [ + { + "type": "string" + } + ] } }, "required": [ diff --git a/twined/schema/twine_schema.json b/twined/schema/twine_schema.json index 9522ffb..eda7828 100644 --- a/twined/schema/twine_schema.json +++ b/twined/schema/twine_schema.json @@ -96,8 +96,12 @@ }, "tags": { "description": "Comma separated tags that will be applied to the dataset when created", - "type": "string", - "default": "" + "type": "array", + "items": [ + { + "type": "string" + } + ] } }, "required": ["key"] From f755cc67844bd2ac1b563b362787b2d2479b0b75 Mon Sep 17 00:00:00 2001 From: cortadocodes Date: Wed, 21 Apr 2021 20:56:10 +0100 Subject: [PATCH 2/3] OPS: Improve description of release workflow --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 51a236b..0d07e42 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Publish on merge of release/x.y.z into main +name: Release the package on merge of release/x.y.z into main # Only trigger when a pull request into main branch is closed. on: From 2b09e083127950e5b8cd74506068be98b5af9796 Mon Sep 17 00:00:00 2001 From: cortadocodes Date: Wed, 21 Apr 2021 20:59:14 +0100 Subject: [PATCH 3/3] OPS: Increase patch version number --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 827b119..f6ab29a 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ setup( name="twined", - version="0.0.17", + version="0.0.18", py_modules=[], install_requires=["jsonschema ~= 3.2.0", "python-dotenv"], url="https://www.github.com/octue/twined",