Merge branch 'main' into main

.github/workflows/ci-pr.yml

@@ -6,7 +6,7 @@ on:
   pull_request_target:
     branches:
       - main
-    types: [opened, edited, synchronize]
+    types: [opened, reopened, synchronize]
   workflow_dispatch:
 
 env:
@@ -111,14 +111,14 @@ jobs:
 
       - name: Store artifacts
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: voc4cat-outbox_${{ env.RUN_DATE }}_run${{ GITHUB.RUN_ID }}
           path: outbox/
 
       - name: Add/stage vocabulary changes
         # Pinning of action managed by dependabot
-        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
+        uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842
         with:
           # glob pattern of files which should be added to the commit
           file_pattern: 'vocabularies/\*.ttl'
@@ -130,7 +130,7 @@ jobs:
 
       - name: Commit vocabulary changes & xlsx cleanup on behalf of PR-author
         # Pinning of action managed by dependabot
-        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
+        uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842
         with:
           commit_user_name: voc4cat-CI-bot
           commit_message: 'CI: vocabulary update in ${{ GITHUB.SERVER_URL }}/${{ GITHUB.REPOSITORY }}/actions/runs/${{ GITHUB.RUN_ID }}'

.github/workflows/merge.yml

@@ -94,7 +94,7 @@ jobs:
         # checked out the gh-pages branch above so that we keep all prior
         # content and just re-publish the extended version.
         # Pinning of action managed by dependabot
-        uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847
+        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e
         if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main'
         with:
           publish_branch: gh-pages
@@ -106,7 +106,7 @@ jobs:
         # This step is not required and may be removed.
         # It may be helpful for trouble shooting.
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: voc4cat-pages-dev-content
           path: publish/

.github/workflows/publish.yml

@@ -97,7 +97,7 @@ jobs:
         # checked out the gh-pages branch above so that we keep all prior
         # content and just re-publish the extended version.
         # Pinning of action managed by dependabot
-        uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847
+        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e
         with:
           publish_branch: gh-pages
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -108,7 +108,7 @@ jobs:
         # This step is not required and may be removed.
         # It may be helpful for trouble shooting.
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: voc4cat-pages-release-${{ github.ref_name }}
           path: publish/

README.md

@@ -73,26 +73,29 @@ To discuss about the **voc4cat**-vocabulary maintained here, create an [issue](h
 
 To contribute new concepts or collections or change existing ones, you may either submit your contributions as Excel/xlsx-file or (as an expert) as new/changed turtle file.
 
-> Small contributions like adding a single concept are as valuable as bigger ones. 
-> In fact if you plan a bigger change (50+ concepts), consider splitting up the additions/changes into smaller chunks with max. ~25 changes to make the review process not too hard for the reviewers and you as author. 
+> Small contributions like adding a single concept are as valuable as bigger ones.
+> In fact if you plan a bigger change (50+ concepts), consider splitting up the additions/changes into smaller chunks with max. ~20 changes to make the review process not too hard for the reviewers and you as author.
 
 Here are the steps for submitting updates via Excel/xlsx.
 
 - Get the Excel/xlsx-vocabulary file
   - The most recent version of the vocabulary is always available via GitHub-pages https://nfdi4cat.github.io/voc4cat/dev/voc4cat.xlsx
 - Make changes to the Excel file. If you want to add something new you need to [request a range of IDs](https://github.com/nfdi4cat/voc4cat/issues/new/choose) for you.
-- Add the xlsx file to your clone of the repository into the folder `inbox-excel-vocabs`
+- Create a fork of the voc4cat repository (if you don't yet have one) or pull the latest changes to your fork (via "Sync fork" button in GUI).
+- Create a feature branch for your contribution (via GitHub GUI or `git switch -c name-of-branch`)
+  - Add the xlsx file to the feature branch into the folder `inbox-excel-vocabs`
   - The name of the file must match the vocabulary that you want to update. So do not change the filename, but keep `voc4cat.xlsx`.
 - Create a pull request with the updated Excel-file in this repository.
   - Please describe your changes and the motivation for the changes in the pull request note or link to an issue with this information. This will help reviewers to understand the proposed change and decide about it.
-- Your pull request will be processed automatically by a CI/CD pipeline that typically runs less than a minute.
+- Your pull request will be processed automatically by a CI/CD pipeline that typically finishes in less than a minute.
 - Review the artifacts/logs generated by the CI pipeline.
   - The [workflow artifact](https://docs.github.com/en/actions/managing-workflow-runs/downloading-workflow-artifacts) will contain an updated xlsx file that is recreated from the updated turtle-file.
 - If all is good your contribution will be either
   - directly merged by the maintainers
   - or a discussion will be started about what else is needed
   - or why the proposed change may not fit.
-- If you need to fix something update the pull request branch. This will trigger the pipeline to run again.
+- If you need to fix something, commit further changes to the pull request branch in your clone.
+  - If any commits have been made by the CI pipeline, pull the changes to your repo (via "Sync fork" button in GUI) before committing any additional changes.
 
 Finally, when the proposed pull request is accepted, your changes will be integrated in the vocabularies in the folder `vocabularies`. 
 The vocabularies are stored in split form using one folder per vocabulary.

vocabularies/voc4cat/0007020.ttl

@@ -5,10 +5,10 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
 <https://w3id.org/nfdi4cat/voc4cat_0007020>
     a skos:Concept ;
     dcterms:identifier "voc4cat_0007020"^^xsd:token ;
-    skos:broader <https://w3id.org/nfdi4cat/voc4cat_0007036> ;
     skos:definition "The part of the reactor where the catalyst is located, characterized by length, diameter, volume."@en ;
     skos:historyNote "0000-0002-4041-0165 Julia Schumann created the resource"@en ;
     skos:inScheme <https://w3id.org/nfdi4cat/voc4cat_> ;
     skos:prefLabel "catalyst bed"@en ;
+    skos:topConceptOf <https://w3id.org/nfdi4cat/voc4cat_> ;
 .
 

vocabularies/voc4cat/0007036.ttl

@@ -11,9 +11,7 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
     skos:definition "A chemical reactor in which the reaction is carried out in the presence of a catalyst."@en ;
     skos:historyNote "0000-0002-4041-0165 Julia Schumann created the resource"@en ;
     skos:inScheme <https://w3id.org/nfdi4cat/voc4cat_> ;
-    skos:narrower
-        <https://w3id.org/nfdi4cat/voc4cat_0007019> ,
-        <https://w3id.org/nfdi4cat/voc4cat_0007020> ;
+    skos:narrower <https://w3id.org/nfdi4cat/voc4cat_0007019> ;
     skos:prefLabel "catalytic reactor"@en ;
 .
 

vocabularies/voc4cat/0007206.ttl

@@ -8,6 +8,11 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
     skos:definition "An electroanalytical technique based on the measurement of the electromotive force of an electrochemical cell comprised of a measuring and a reference electrode."@en ;
     skos:historyNote "0009-0008-1278-8890 Michael Götte created the resource"@en ;
     skos:inScheme <https://w3id.org/nfdi4cat/voc4cat_> ;
+    skos:narrower
+        <https://w3id.org/nfdi4cat/voc4cat_0007208> ,
+        <https://w3id.org/nfdi4cat/voc4cat_0007209> ,
+        <https://w3id.org/nfdi4cat/voc4cat_0007212> ,
+        <https://w3id.org/nfdi4cat/voc4cat_0007237> ;
     skos:prefLabel "potentiometry"@en ;
     skos:topConceptOf <https://w3id.org/nfdi4cat/voc4cat_> ;
 .

vocabularies/voc4cat/0007207.ttl

@@ -6,10 +6,10 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
     a skos:Concept ;
     dcterms:identifier "voc4cat_0007207"^^xsd:token ;
     skos:altLabel "CA"@en ;
+    skos:broader <https://w3id.org/nfdi4cat/voc4cat_0007237> ;
     skos:definition "An electrochemical measuring technique used for electrochemical analysis or for the determination of the kinetics and mechanism of electrode reactions. A fast-rising potential pulse is enforced on the working electrode of an electrochemical cell and the current flowing through this electrode is measured as a function of time."@en ;
     skos:historyNote "0009-0008-1278-8890 Michael Götte created the resource"@en ;
     skos:inScheme <https://w3id.org/nfdi4cat/voc4cat_> ;
     skos:prefLabel "chronoamperometry"@en ;
-    skos:topConceptOf <https://w3id.org/nfdi4cat/voc4cat_> ;
 .
 

vocabularies/voc4cat/0007208.ttl

@@ -6,10 +6,10 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
     a skos:Concept ;
     dcterms:identifier "voc4cat_0007208"^^xsd:token ;
     skos:altLabel "CP"@en ;
+    skos:broader <https://w3id.org/nfdi4cat/voc4cat_0007206> ;
     skos:definition "An electrochemical measuring technique used for electrochemical analysis or for the determination of the kinetics and mechanism of electrode reactions. A fast-rising current pulse is enforced on the working electrode of an electrochemical cell and the potential of this electrode is measured against a reference electrode as a function of time."@en ;
     skos:historyNote "0009-0008-1278-8890 Michael Götte created the resource"@en ;
     skos:inScheme <https://w3id.org/nfdi4cat/voc4cat_> ;
     skos:prefLabel "chronopotentiometry"@en ;
-    skos:topConceptOf <https://w3id.org/nfdi4cat/voc4cat_> ;
 .
 

vocabularies/voc4cat/0007209.ttl

@@ -6,10 +6,10 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
     a skos:Concept ;
     dcterms:identifier "voc4cat_0007209"^^xsd:token ;
     skos:altLabel "EIS"@en ;
+    skos:broader <https://w3id.org/nfdi4cat/voc4cat_0007206> ;
     skos:definition "A powerful tool for examining processes occurring at electrode surfaces. A small amplitude ac (sinusoidal) excitation signal (potential or current), covering a wide range of frequencies, is applied to the system under investigation and the response (current or voltage or another signal of interest) is measured. It is routinely used in electrode kinetics and mechanism investigations, and in the characterization of batteries, fuel cells, and corrosion phenomena."@en ;
     skos:historyNote "0009-0008-1278-8890 Michael Götte created the resource"@en ;
     skos:inScheme <https://w3id.org/nfdi4cat/voc4cat_> ;
     skos:prefLabel "electrochemical impedance spectroscopy "@en ;
-    skos:topConceptOf <https://w3id.org/nfdi4cat/voc4cat_> ;
 .
 

vocabularies/voc4cat/0007212.ttl

@@ -6,10 +6,10 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
     a skos:Concept ;
     dcterms:identifier "voc4cat_0007212"^^xsd:token ;
     skos:altLabel "CC"@en ;
+    skos:broader <https://w3id.org/nfdi4cat/voc4cat_0007206> ;
     skos:definition "An electrochemical measuring technique used for electrochemical analysis or for the determination of the kinetics and mechanism of electrode reactions. A fast-rising potential pulse is enforced on the working electrode of an electrochemical cell and the electrical charge passing through this electrode is measured as a function of time."@en ;
     skos:historyNote "0009-0008-1278-8890 Michael Götte created the resource"@en ;
     skos:inScheme <https://w3id.org/nfdi4cat/voc4cat_> ;
     skos:prefLabel "chronocoulometry"@en ;
-    skos:topConceptOf <https://w3id.org/nfdi4cat/voc4cat_> ;
 .
 

vocabularies/voc4cat/0007237.ttl

@@ -5,13 +5,14 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
 <https://w3id.org/nfdi4cat/voc4cat_0007237>
     a skos:Concept ;
     dcterms:identifier "voc4cat_0007237"^^xsd:token ;
+    skos:broader <https://w3id.org/nfdi4cat/voc4cat_0007206> ;
     skos:definition "An electrochemical measuring technique used for electrochemical analysis, for the determination of the kinetics and mechanism of electrode reactions, and for corrosion studies. \"Voltammetry\" is a family of techniques with the common characteristics that the potential of the working electrode is controlled (typically with a potentiostat) and the current flowing through the electrode is measured. "@en ;
     skos:historyNote "0009-0008-1278-8890 Michael Götte created the resource"@en ;
     skos:inScheme <https://w3id.org/nfdi4cat/voc4cat_> ;
     skos:narrower
         <https://w3id.org/nfdi4cat/voc4cat_0000082> ,
+        <https://w3id.org/nfdi4cat/voc4cat_0007207> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007211> ;
     skos:prefLabel "voltammetry"@en ;
-    skos:topConceptOf <https://w3id.org/nfdi4cat/voc4cat_> ;
 .
 

vocabularies/voc4cat/concept_scheme.ttl

@@ -12,7 +12,7 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
         <https://w3id.org/nfdi4cat/voc4cat_0001900> ,
         <https://w3id.org/nfdi4cat/voc4cat_0001901> ;
     dcterms:identifier "voc4cat_"^^xsd:token ;
-    dcterms:modified "2024-04-08"^^xsd:date ;
+    dcterms:modified "2024-04-29"^^xsd:date ;
     dcterms:publisher <https://w3id.org/nfdi4cat/> ;
     owl:versionInfo "v_6524d1c2" ;
     skos:definition "A vocabulary for all areas of catalysis initiated in NFDI4Cat. Starting with photocatalysis we add more and more terms from other areas of catalysis and related disciplines like chemical engineering or materials science."@en ;
@@ -35,6 +35,7 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
         <https://w3id.org/nfdi4cat/voc4cat_0007016> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007017> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007018> ,
+        <https://w3id.org/nfdi4cat/voc4cat_0007020> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007023> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007024> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007025> ,
@@ -43,11 +44,7 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
         <https://w3id.org/nfdi4cat/voc4cat_0007101> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007201> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007206> ,
-        <https://w3id.org/nfdi4cat/voc4cat_0007207> ,
-        <https://w3id.org/nfdi4cat/voc4cat_0007208> ,
-        <https://w3id.org/nfdi4cat/voc4cat_0007209> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007210> ,
-        <https://w3id.org/nfdi4cat/voc4cat_0007212> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007219> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007220> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007221> ,
@@ -62,7 +59,6 @@ PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
         <https://w3id.org/nfdi4cat/voc4cat_0007230> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007233> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007234> ,
-        <https://w3id.org/nfdi4cat/voc4cat_0007237> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007238> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007239> ,
         <https://w3id.org/nfdi4cat/voc4cat_0007240> ,