Resolve merge conflicts

geneontology · Aug 29, 2023 · 335d2ba · 335d2ba
2 parents 4857b5f + 6cca4f4
commit 335d2ba
Show file tree

Hide file tree

Showing 19 changed files with 414 additions and 152 deletions.
diff --git a/docs/gorules_test_errors.gaf b/docs/gorules_test_errors.gaf
diff --git a/metadata/datasets.schema.yaml b/metadata/datasets.schema.yaml
@@ -112,6 +112,10 @@ mapping:
             type: str
             required: false
             unique: false
+          "mirror_of":
+            type: str
+            required: false
+            unique: false
           "species_code":
             type: str
             required: false

diff --git a/metadata/datasets/fb.yaml b/metadata/datasets/fb.yaml
@@ -22,4 +22,18 @@ datasets:
    species_code: Dmel
    taxa:
     - NCBITaxon:7227
-
+ -
+   id: fb.gpi
+   label: "fb gpi file"
+   description: "gpi file for Drosophila melanogaster from FlyBase"
+   url: http://current.geneontology.org/annotations/fb.gpi.gz
+   type: gpi
+   dataset: fb
+   submitter: fb
+   compression: gzip
+   source: http://ftp.flybase.net/releases/current/precomputed_files/collaborators/gp_information.fb.gz
+   entity_type:
+   status: active
+   species_code: Dmel
+   taxa:
+    - NCBITaxon:7227