From 54548039e418f7e1d4c2066911fb83d628a9492d Mon Sep 17 00:00:00 2001 From: dustine32 Date: Wed, 16 Sep 2020 11:14:12 -0700 Subject: [PATCH 1/2] Add filter_for to dataset schema and yamls for #1553 --- metadata/datasets.schema.yaml | 9 +++++++++ metadata/datasets/mgi.yaml | 3 +++ metadata/datasets/wb.yaml | 3 +++ 3 files changed, 15 insertions(+) diff --git a/metadata/datasets.schema.yaml b/metadata/datasets.schema.yaml index a5123e9b..a6ee0565 100644 --- a/metadata/datasets.schema.yaml +++ b/metadata/datasets.schema.yaml @@ -69,6 +69,15 @@ mapping: required: false sequence: - type: str + "filter_for": + type: map + required: false + mapping: + "provided_by": + type: seq + required: false + sequence: + - type: str "datasets": type: seq required: true diff --git a/metadata/datasets/mgi.yaml b/metadata/datasets/mgi.yaml index fc9f8889..58d1c0fe 100644 --- a/metadata/datasets/mgi.yaml +++ b/metadata/datasets/mgi.yaml @@ -16,6 +16,9 @@ filter_out: reference: PMID:21873635 annotation_properties: - noctua-model-id +filter_for: + provided_by: + - MGI datasets: - id: mgi.gaf diff --git a/metadata/datasets/wb.yaml b/metadata/datasets/wb.yaml index 6cb6358d..55097139 100644 --- a/metadata/datasets/wb.yaml +++ b/metadata/datasets/wb.yaml @@ -13,6 +13,9 @@ filter_out: evidence_reference: - evidence: ECO:0000320 reference: PMID:21873635 +filter_for: + provided_by: + - WB datasets: - id: wb.gaf From 1365952a4a0a8977e0403eddc8a17920d108e760 Mon Sep 17 00:00:00 2001 From: dustine32 Date: Wed, 16 Sep 2020 16:13:23 -0700 Subject: [PATCH 2/2] Documentation comments for GoRule57 filters in schema #1553 --- metadata/datasets.schema.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/metadata/datasets.schema.yaml b/metadata/datasets.schema.yaml index a6ee0565..862f4367 100644 --- a/metadata/datasets.schema.yaml +++ b/metadata/datasets.schema.yaml @@ -41,6 +41,8 @@ mapping: type: str required: false unique: false + # 'filter_out' is used in GO rule 57 to filter out annotation lines matching specified criteria + # This filter is only active in the import context when a dataset has its import flag set to True "filter_out": type: map required: false @@ -69,6 +71,8 @@ mapping: required: false sequence: - type: str + # 'filter_for' is used in GO rule 57 to filter annotation lines, keeping only the lines matching specified criteria + # This filter is only active in the import context when a dataset has its import flag set to True "filter_for": type: map required: false