Skip to content

Commit

Permalink
Merge branch 'nfdi4cat:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
markdoerr committed Feb 22, 2024
2 parents fae24ae + e12e55f commit fb4923b
Show file tree
Hide file tree
Showing 6 changed files with 50 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
python -m pip install --upgrade pip setuptools wheel
# install tagged version
python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@v0.8.1
python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@v0.8.2
# python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@main
# install custom pylode 2.x (adds sorted collections,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
python -m pip install --upgrade pip setuptools wheel
# install tagged version
python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@v0.8.1
python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@v0.8.2
# python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@main
# install custom pylode 2.x
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
python -m pip install --upgrade pip setuptools wheel
# install tagged version
python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@v0.8.1
python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@v0.8.2
# python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@main
# install custom pylode 2.x
Expand Down
4 changes: 2 additions & 2 deletions idranges.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ ror_id = ""

[vocabs.biocatalysis_demo]
id_length = 7
permanent_iri_part = "https://example.org/voc4cat_biocatalysis/"
permanent_iri_part = "https://w3id.org/nfdi4cat/voc4cat_biocat"

[vocabs.biocatalysis_demo.checks]
allow_delete = false

[vocabs.biocatalysis_demo.prefix_map]
v4c-bc = "https://example.org/voc4cat_biocatalysis/"
v4c-bc = "https://w3id.org/nfdi4cat/voc4cat_biocat"

[[vocabs.biocatalysis_demo.id_range]]
first_id = 1
Expand Down
23 changes: 23 additions & 0 deletions test_xlsx_locally.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@echo off
rem This script runs the key steps from the gh-action pipeline locally
rem which may help to spot problems before submitting an exlsx file
rem in a pull request. Using this script is completely optional.
rem Make sure you have voc4cat-tool installed (https://pypi.org/project/voc4cat/)

rem check inbox file names
voc4cat check --config idranges.toml --logfile outbox/voc4cat.log --ci-pre inbox-excel-vocabs/ vocabularies

rem check xlsx file(s). If the check fails, write annotated file to outbox.
voc4cat check --config idranges.toml --logfile outbox/voc4cat.log --outdir outbox inbox-excel-vocabs/

rem convert file(s) from xlsx in inbox to turtle in outbox
voc4cat convert --config idranges.toml --logfile outbox/voc4cat.log --outdir outbox inbox-excel-vocabs/

rem post-convert checks of all ttl file(s) in outbox
voc4cat check --config idranges.toml --logfile outbox/voc4cat.log outbox/

rem build HTML documentation
voc4cat docs --logfile outbox/voc4cat.log --force outbox/

rem Split vocabulary and merge into vocabulary dir (in PR branch)
voc4cat transform --split --inplace --logfile outbox/voc4cat.log --outdir outbox_new_voc outbox/
22 changes: 22 additions & 0 deletions test_xlsx_locally.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This script runs the key steps from the gh-action pipeline locally
# which may help to spot problems before submitting an exlsx file
# in a pull request. Using this script is completely optional.
# Make sure you have voc4cat-tool installed (https://pypi.org/project/voc4cat/)

# check inbox file names
voc4cat check --config idranges.toml --logfile outbox/voc4cat.log --ci-pre inbox-excel-vocabs/ vocabularies

# check xlsx file(s). If the check fails, write annotated file to outbox.
voc4cat check --config idranges.toml --logfile outbox/voc4cat.log --outdir outbox inbox-excel-vocabs/

# convert file(s) from xlsx in inbox to turtle in outbox
voc4cat convert --config idranges.toml --logfile outbox/voc4cat.log --outdir outbox inbox-excel-vocabs/

# post-convert checks of all ttl file(s) in outbox
voc4cat check --config idranges.toml --logfile outbox/voc4cat.log outbox/

# build HTML documentation
voc4cat docs --logfile outbox/voc4cat.log --force outbox/

# Split vocabulary and merge into vocabulary dir (in PR branch)
voc4cat transform --split --inplace --logfile outbox/voc4cat.log --outdir outbox_new_voc outbox/

0 comments on commit fb4923b

Please sign in to comment.