diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 28bb4ba..8bdecdc 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -73,8 +73,8 @@ jobs: python -m pip install --upgrade pip setuptools wheel # Select to install a stable tagged version or main branch (in development) - # python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@v1.0.3 - python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@main + python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@v1.0.4 + # python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@main # install custom pylode 2.x (adds sorted collections, # uses URIs as fragment IDs and is git-installable) @@ -120,7 +120,7 @@ jobs: find inbox-excel-vocabs -name '*.xlsx' -exec cp {} -t outbox/ \; git status # Add/update dct:created and dct:modified base on git history - voc4cat transform --prov-from-git --inplace --config idranges.toml --logfile outbox/voc4cat.log vocabularies/ + voc4cat transform --prov-from-git --diff-base origin/main --inplace --config idranges.toml --logfile outbox/voc4cat.log vocabularies/ - name: Run voc4cat (re-build updated Excel file and joined turtle vocabulary file) # Passing the config is important to make use of the prefixes therein. diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index b06dd19..8c6d26a 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -65,8 +65,8 @@ jobs: python -m pip install --upgrade pip setuptools wheel # Select to install a stable tagged version or main branch (in development) - # python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@v1.0.3 - python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@main + python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@v1.0.4 + # python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@main # install custom pylode 2.x python -m pip install git+https://github.com/dalito/pyLODE.git@nfdi4cat-2.x diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 10b0e30..9fb1232 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -61,8 +61,8 @@ jobs: python -m pip install --upgrade pip setuptools wheel # Select to install a stable tagged version or main branch (in development) - # python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@v1.0.3 - python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@main + python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@v1.0.4 + # python -m pip install git+https://github.com/nfdi4cat/voc4cat-tool.git@main # install custom pylode 2.x python -m pip install git+https://github.com/dalito/pyLODE.git@nfdi4cat-2.x diff --git a/justfile b/justfile index b827883..076a35d 100644 --- a/justfile +++ b/justfile @@ -89,7 +89,7 @@ join: # Add provenance information to all ttl files in vocabularies/ [group('individual steps')] prov: - voc4cat transform --prov-from-git --inplace --config idranges.toml --logfile outbox/voc4cat.log vocabularies/ + voc4cat transform --prov-from-git --diff-base origin/main --inplace --config idranges.toml --logfile outbox/voc4cat.log vocabularies/ # Run all steps as in gh-actions: check xlsx, convert to SKOS, build docs, re-build xlsx all: check convert docs xlsx diff --git a/vocabularies/vocab_example/IDs0000xxx/0000001.ttl b/vocabularies/vocab_example/IDs0000xxx/0000001.ttl index 1ad94f9..df5511a 100644 --- a/vocabularies/vocab_example/IDs0000xxx/0000001.ttl +++ b/vocabularies/vocab_example/IDs0000xxx/0000001.ttl @@ -8,7 +8,7 @@ PREFIX xsd: a skos:Concept ; dcterms:created "2023-08-10"^^xsd:date ; dcterms:identifier "0000001"^^xsd:token ; - dcterms:modified "2026-02-01"^^xsd:date ; + dcterms:modified "2026-02-14"^^xsd:date ; dcterms:provenance ; rdfs:seeAlso ; skos:altLabel "URI"@en ; diff --git a/vocabularies/vocab_example/IDs0000xxx/0000002.ttl b/vocabularies/vocab_example/IDs0000xxx/0000002.ttl index f378386..cc9a622 100644 --- a/vocabularies/vocab_example/IDs0000xxx/0000002.ttl +++ b/vocabularies/vocab_example/IDs0000xxx/0000002.ttl @@ -8,7 +8,7 @@ PREFIX xsd: a skos:Concept ; dcterms:created "2023-08-10"^^xsd:date ; dcterms:identifier "0000002"^^xsd:token ; - dcterms:modified "2026-02-01"^^xsd:date ; + dcterms:modified "2026-02-14"^^xsd:date ; dcterms:provenance ; rdfs:seeAlso ; skos:altLabel diff --git a/vocabularies/vocab_example/IDs0000xxx/0000003.ttl b/vocabularies/vocab_example/IDs0000xxx/0000003.ttl index 5576f29..02b2855 100644 --- a/vocabularies/vocab_example/IDs0000xxx/0000003.ttl +++ b/vocabularies/vocab_example/IDs0000xxx/0000003.ttl @@ -8,7 +8,7 @@ PREFIX xsd: a skos:Concept ; dcterms:created "2023-08-10"^^xsd:date ; dcterms:identifier "0000003"^^xsd:token ; - dcterms:modified "2026-02-01"^^xsd:date ; + dcterms:modified "2026-02-14"^^xsd:date ; dcterms:provenance ; rdfs:seeAlso ; skos:altLabel "IRI"@en ; diff --git a/vocabularies/vocab_example/IDs0000xxx/0000010.ttl b/vocabularies/vocab_example/IDs0000xxx/0000010.ttl index fe7cc27..2d24a33 100644 --- a/vocabularies/vocab_example/IDs0000xxx/0000010.ttl +++ b/vocabularies/vocab_example/IDs0000xxx/0000010.ttl @@ -7,7 +7,7 @@ PREFIX xsd: a skos:Collection ; dcterms:created "2023-08-10"^^xsd:date ; dcterms:identifier "0000010"^^xsd:token ; - dcterms:modified "2026-02-01"^^xsd:date ; + dcterms:modified "2026-02-14"^^xsd:date ; dcterms:provenance ; rdfs:isDefinedBy ; rdfs:seeAlso ; diff --git a/vocabularies/vocab_example/concept_scheme.ttl b/vocabularies/vocab_example/concept_scheme.ttl index 65be3fc..470b833 100644 --- a/vocabularies/vocab_example/concept_scheme.ttl +++ b/vocabularies/vocab_example/concept_scheme.ttl @@ -12,7 +12,7 @@ PREFIX xsd: , ; dcterms:identifier ""^^xsd:token ; - dcterms:modified "2026-02-01"^^xsd:date ; + dcterms:modified "2026-02-14"^^xsd:date ; dcterms:publisher ; owl:versionInfo "v2023-03-10" ; skos:definition "Description of the vocabulary"@en ;