Skip to content

Commit cd6a15e

Browse files
ejmolinelliEvan MolinelliEvan Molinelligithub-actions
authored
feat: pinned ontologies for schema 5.3.0 (#275)
## Reason for Change - #229 ## Changes - modify pinned ontology versions ## Testing steps - NONE ## Notes for Reviewer --------- Co-authored-by: Evan Molinelli <[email protected]> Co-authored-by: Evan Molinelli <[email protected]> Co-authored-by: github-actions <[email protected]>
1 parent a930332 commit cd6a15e

20 files changed

+41
-29
lines changed

.github/workflows/generate_all_ontology.yml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- "**/asset-schemas/ontology_info_schema.json"
1111
- "**/asset-schemas/all_ontology_schema.json"
1212
- "**/tools/ontology-builder/src/all_ontology_generator.py"
13+
- "**/ontology-assets/ontology_info.json"
1314
branches-ignore:
1415
- main
1516

.github/workflows/generate_diff_ontology.yml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313

1414
jobs:
1515
ontology-processing:
16+
if: false # DISABLE. Should run instead of generate_all_ontology.yml
1617
runs-on: ubuntu-latest
1718
steps:
1819
- name: Checkout
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1b41e396a7ce1aaca9dfcc6959880a310a62cd5d
1+
ab022d6d60ffed979f804eeef451ae1412c1f57a

api/python/pyproject.toml

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "cellxgene_ontology_guide"
7-
version = "1.5.0-alpha"
7+
version = "1.5.0"
88
description = "Access ontology metadata used by CZ cellxgene"
99
authors = [
1010
{ name = "Chan Zuckerberg Initiative Foundation", email = "[email protected]" }
@@ -31,7 +31,13 @@ Issues = "https://github.com/chanzuckerberg/cellxgene-ontology-guide/issues"
3131
Changelog = "https://github.com/chanzuckerberg/cellxgene-ontology-guide/blob/main/api/python/CHANGELOG.md"
3232

3333
[project.optional-dependencies]
34-
test = ["pytest", "coverage", "nbconvert", "jupyter"]
34+
test = [
35+
"pytest",
36+
"coverage",
37+
"nbconvert",
38+
"jupyter",
39+
"nbformat>=5.10.4",
40+
]
3541
docs = ["pdoc"]
3642

3743
[tool.setuptools.packages.find]
Binary file not shown.
1.13 MB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
18.4 KB
Binary file not shown.
Binary file not shown.

ontology-assets/latest_ontology_info.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"ontologies": {
33
"CL": {
4-
"version": "v2024-08-16",
4+
"version": "v2025-02-13",
55
"source": "https://github.com/obophenotype/cell-ontology/releases/download",
66
"filename": "cl.owl",
77
"cross_ontology_mapping": "cl.sssom.tsv"
88
},
99
"EFO": {
10-
"version": "v3.74.0",
10+
"version": "v3.75.0",
1111
"source": "https://github.com/EBISPOT/efo/releases/download",
1212
"filename": "efo.owl"
1313
},
@@ -17,38 +17,38 @@
1717
"filename": "hancestro.owl"
1818
},
1919
"HsapDv": {
20-
"version": "v2024-05-28",
20+
"version": "v2025-01-23",
2121
"source": "https://github.com/obophenotype/developmental-stage-ontologies/releases/download",
2222
"filename": "hsapdv.owl"
2323
},
2424
"MONDO": {
25-
"version": "v2024-08-06",
25+
"version": "v2025-02-04",
2626
"source": "https://github.com/monarch-initiative/mondo/releases/download",
2727
"filename": "mondo.owl"
2828
},
2929
"MmusDv": {
30-
"version": "v2024-05-28",
30+
"version": "v2025-01-23",
3131
"source": "https://github.com/obophenotype/developmental-stage-ontologies/releases/download",
3232
"filename": "mmusdv.owl"
3333
},
3434
"NCBITaxon": {
35-
"version": "v2023-06-20",
35+
"version": "v2024-11-25",
3636
"source": "https://github.com/obophenotype/ncbitaxon/releases/download",
3737
"filename": "ncbitaxon.owl.gz"
3838
},
3939
"UBERON": {
40-
"version": "v2024-08-07",
40+
"version": "v2025-01-15",
4141
"source": "https://github.com/obophenotype/uberon/releases/download",
4242
"filename": "uberon.owl",
4343
"cross_ontology_mapping": "uberon.sssom.tsv"
4444
},
4545
"PATO": {
46-
"version": "v2023-05-18",
46+
"version": "v2025-02-01",
4747
"source": "https://github.com/pato-ontology/pato/raw",
4848
"filename": "pato.owl"
4949
},
5050
"FBbt": {
51-
"version": "v2024-12-05",
51+
"version": "v2025-02-13",
5252
"source": "https://github.com/FlyBase/drosophila-anatomy-developmental-ontology/releases/download",
5353
"filename": "fbbt.owl",
5454
"map_to": [
@@ -57,12 +57,12 @@
5757
]
5858
},
5959
"FBdv": {
60-
"version": "v2024-12-04",
60+
"version": "v2025-02-12",
6161
"source": "https://github.com/FlyBase/drosophila-developmental-ontology/releases/download",
6262
"filename": "fbdv.owl"
6363
},
6464
"ZFA": {
65-
"version": "v2022-12-09",
65+
"version": "v2025-01-28",
6666
"source": "https://github.com/ZFIN/zebrafish-anatomical-ontology/raw",
6767
"filename": "zfa.owl",
6868
"additional_ontologies": [
@@ -74,12 +74,12 @@
7474
]
7575
},
7676
"WBls": {
77-
"version": "vWS295",
77+
"version": "vWS296",
7878
"source": "https://github.com/obophenotype/c-elegans-development-ontology/raw/",
7979
"filename": "wbls.owl"
8080
},
8181
"WBbt": {
82-
"version": "v2024-09-24",
82+
"version": "v2025-01-02",
8383
"source": "https://github.com/obophenotype/c-elegans-gross-anatomy-ontology/raw",
8484
"filename": "wbbt.owl",
8585
"map_to": [

ontology-assets/ontology_info.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"5.3.0": {
33
"ontologies": {
44
"CL": {
5-
"version": "v2024-08-16",
5+
"version": "v2025-02-13",
66
"source": "https://github.com/obophenotype/cell-ontology/releases/download",
77
"filename": "cl.owl",
88
"cross_ontology_mapping": "cl.sssom.tsv"
99
},
1010
"EFO": {
11-
"version": "v3.74.0",
11+
"version": "v3.75.0",
1212
"source": "https://github.com/EBISPOT/efo/releases/download",
1313
"filename": "efo.owl"
1414
},
@@ -18,38 +18,38 @@
1818
"filename": "hancestro.owl"
1919
},
2020
"HsapDv": {
21-
"version": "v2024-05-28",
21+
"version": "v2025-01-23",
2222
"source": "https://github.com/obophenotype/developmental-stage-ontologies/releases/download",
2323
"filename": "hsapdv.owl"
2424
},
2525
"MONDO": {
26-
"version": "v2024-08-06",
26+
"version": "v2025-02-04",
2727
"source": "https://github.com/monarch-initiative/mondo/releases/download",
2828
"filename": "mondo.owl"
2929
},
3030
"MmusDv": {
31-
"version": "v2024-05-28",
31+
"version": "v2025-01-23",
3232
"source": "https://github.com/obophenotype/developmental-stage-ontologies/releases/download",
3333
"filename": "mmusdv.owl"
3434
},
3535
"NCBITaxon": {
36-
"version": "v2023-06-20",
36+
"version": "v2024-11-25",
3737
"source": "https://github.com/obophenotype/ncbitaxon/releases/download",
3838
"filename": "ncbitaxon.owl.gz"
3939
},
4040
"UBERON": {
41-
"version": "v2024-08-07",
41+
"version": "v2025-01-15",
4242
"source": "https://github.com/obophenotype/uberon/releases/download",
4343
"filename": "uberon.owl",
4444
"cross_ontology_mapping": "uberon.sssom.tsv"
4545
},
4646
"PATO": {
47-
"version": "v2023-05-18",
47+
"version": "v2025-02-01",
4848
"source": "https://github.com/pato-ontology/pato/raw",
4949
"filename": "pato.owl"
5050
},
5151
"FBbt": {
52-
"version": "v2024-12-05",
52+
"version": "v2025-02-13",
5353
"source": "https://github.com/FlyBase/drosophila-anatomy-developmental-ontology/releases/download",
5454
"filename": "fbbt.owl",
5555
"map_to": [
@@ -58,12 +58,12 @@
5858
]
5959
},
6060
"FBdv": {
61-
"version": "v2024-12-04",
61+
"version": "v2025-02-12",
6262
"source": "https://github.com/FlyBase/drosophila-developmental-ontology/releases/download",
6363
"filename": "fbdv.owl"
6464
},
6565
"ZFA": {
66-
"version": "v2022-12-09",
66+
"version": "v2025-01-28",
6767
"source": "https://github.com/ZFIN/zebrafish-anatomical-ontology/raw",
6868
"filename": "zfa.owl",
6969
"additional_ontologies": [
@@ -75,12 +75,12 @@
7575
]
7676
},
7777
"WBls": {
78-
"version": "vWS295",
78+
"version": "vWS296",
7979
"source": "https://github.com/obophenotype/c-elegans-development-ontology/raw/",
8080
"filename": "wbls.owl"
8181
},
8282
"WBbt": {
83-
"version": "v2024-09-24",
83+
"version": "v2025-01-02",
8484
"source": "https://github.com/obophenotype/c-elegans-gross-anatomy-ontology/raw",
8585
"filename": "wbbt.owl",
8686
"map_to": [

tools/ontology-builder/src/all_ontology_generator.py

+4
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,11 @@ def _parse_ontologies(
338338
for onto_file in os.listdir(working_dir):
339339
if not onto_file.endswith(".owl"):
340340
continue
341+
elif onto_file.rstrip(".owl") not in ontology_info:
342+
logging.info(f"Skipping {onto_file} as it is not in the ontology_info.json")
343+
continue
341344
onto = _load_ontology_object(os.path.join(working_dir, onto_file))
345+
342346
version = ontology_info[onto.name]["version"]
343347
output_file = os.path.join(output_path, get_ontology_file_name(onto.name, version))
344348
logging.info(f"Processing {output_file}")

0 commit comments

Comments
 (0)