diff --git a/.github/workflows/diff.yml b/.github/workflows/diff.yml index 0d87dc280..3db66357d 100644 --- a/.github/workflows/diff.yml +++ b/.github/workflows/diff.yml @@ -61,7 +61,7 @@ jobs: needs: [branch_status] if: ${{ github.event.issue.pull_request }} runs-on: ubuntu-latest - container: obolibrary/odkfull:v1.5 + container: obolibrary/odkfull:v1.5.3 steps: - uses: khan/pull-request-comment-trigger@v1.1.0 id: check @@ -94,7 +94,7 @@ jobs: needs: [branch_status] if: ${{ github.event.issue.pull_request }} runs-on: ubuntu-latest - container: obolibrary/odkfull:v1.5 + container: obolibrary/odkfull:v1.5.3 steps: - uses: khan/pull-request-comment-trigger@v1.1.0 id: check @@ -122,7 +122,7 @@ jobs: needs: [branch_status] if: ${{ github.event.issue.pull_request }} runs-on: ubuntu-latest - container: obolibrary/odkfull:v1.5 + container: obolibrary/odkfull:v1.5.3 steps: - uses: khan/pull-request-comment-trigger@v1.1.0 id: check @@ -147,7 +147,7 @@ jobs: diff_classification: needs: [classify_branch, classify_main] runs-on: ubuntu-latest - container: obolibrary/odkfull:v1.5 + container: obolibrary/odkfull:v1.5.3 steps: - uses: khan/pull-request-comment-trigger@v1.1.0 id: check diff --git a/.github/workflows/qc.yml b/.github/workflows/qc.yml index 48b4fc7ee..fdbf27bf8 100644 --- a/.github/workflows/qc.yml +++ b/.github/workflows/qc.yml @@ -23,7 +23,7 @@ jobs: ontology_qc: # The type of runner that the job will run on runs-on: ubuntu-latest - container: obolibrary/odkfull:v1.5.2 + container: obolibrary/odkfull:v1.5.3 # Steps represent a sequence of tasks that will be executed as part of the job steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it diff --git a/src/ontology/catalog-v001.xml b/src/ontology/catalog-v001.xml index c77f13fa3..9eae1c78d 100644 --- a/src/ontology/catalog-v001.xml +++ b/src/ontology/catalog-v001.xml @@ -1,6 +1,6 @@ - + diff --git a/src/ontology/uberon.Makefile b/src/ontology/uberon.Makefile index bde371d72..8383a740c 100644 --- a/src/ontology/uberon.Makefile +++ b/src/ontology/uberon.Makefile @@ -1257,7 +1257,8 @@ ifeq ($(strip $(IMP)),true) $(MAPPINGDIR)/fbbt.sssom.tsv: .FORCE wget "http://purl.obolibrary.org/obo/fbbt/fbbt.sssom.tsv" -O - | \ sssom-cli --prefix-map-from-input \ - --rule 'object==UBERON:* -> include()' \ + --include 'object==UBERON:*' \ + --update-from-ontology=$(SRC):object,label,existence \ --output $@ # CL mapping set. We simply fetch it as it is from CL. It already @@ -1276,7 +1277,8 @@ $(MAPPINGDIR)/biomappings.sssom.tsv: $(TMPDIR)/biomappings.sssom.tsv \ sssom-cli --input $< --prefix 'UBERON=http://purl.obolibrary.org/obo/UBERON_' \ --rule '!(subject==UBERON:* || object==UBERON:*) -> stop()' \ --rule 'object==UBERON:* -> invert()' \ - --include-all | \ + --include-all \ + --update-from-ontology=$(SRC):subject,label,existence | \ sssom-cli --mangle-iris obo --output $@ $(TMPDIR)/biomappings.sssom.tsv: