Merge branch 'tsmtih/move-artifacts' into test-release

chanzuckerberg · Feb 23, 2024 · cab198d · cab198d
2 parents 7c30657 + c03c8e3
commit cab198d
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/validate_curated_lists.yml b/.github/workflows/validate_curated_lists.yml
@@ -3,7 +3,7 @@ name: Validate Curated List Update
 on:
   push:
     paths:
-      - "**/tools/ontology-builder/src/ontology-references/**.json"
+      - "ontology-references/**.json"
       - "**/artifact-schemas/**.json"
     branches-ignore:
       - main

diff --git a/.../ontology-references/cell_class_list.json → ontology-assets/cell_class_list.json b/.../ontology-references/cell_class_list.json → ontology-assets/cell_class_list.json
diff --git a/...tology-references/cell_subclass_list.json → ontology-assets/cell_subclass_list.json b/...tology-references/cell_subclass_list.json → ontology-assets/cell_subclass_list.json
diff --git a/...r/src/ontology-references/organ_list.json → ontology-assets/organ_list.json b/...r/src/ontology-references/organ_list.json → ontology-assets/organ_list.json
diff --git a/.../src/ontology-references/system_list.json → ontology-assets/system_list.json b/.../src/ontology-references/system_list.json → ontology-assets/system_list.json
diff --git a/...ology-references/tissue_general_list.json → ontology-assets/tissue_general_list.json b/...ology-references/tissue_general_list.json → ontology-assets/tissue_general_list.json
diff --git a/tools/ontology-builder/src/env.py b/tools/ontology-builder/src/env.py
@@ -8,3 +8,4 @@
 ONTO_INFO_YAML = os.path.join(FIXTURES_ROOT, "ontology_info.yml")
 PARSED_ONTOLOGIES_FILE = os.path.join(FIXTURES_ROOT, "all_ontology.json.gz")
 SCHEMA_DIR = os.path.join(os.path.realpath(__file__).rsplit("/", maxsplit=4)[0], "artifact-schemas")
+ONTOLOGY_ASSETS = os.path.join(os.path.realpath(__file__).rsplit("/", maxsplit=4)[0], "ontology-assets")
diff --git a/tools/ontology-builder/src/validate_curated_lists.py b/tools/ontology-builder/src/validate_curated_lists.py
@@ -29,7 +29,7 @@ def verify_json(schema_file_name: str, json_file_name: str) -> bool:
     return True
 
 
-def main(path: str = env.ONTOLOGY_REF_DIR) -> None:
+def main(path: str = env.ONTOLOGY_ASSETS) -> None:
     """
     Verify the curated JSON lists match their respective JSON schema in artifact-schemas
     :param path: The destination path for the json files