diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 7a968a8d..217d8b03 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,6 +1,15 @@ +# This configures updates via dependabot only for github actions. +# All updates are grouped into a single PR. + version: 2 updates: - package-ecosystem: github-actions directory: "/" schedule: interval: monthly + groups: + github-actions: + patterns: + - "*" + +# Ref: https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index a4ccbf90..9ef011f5 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -73,7 +73,7 @@ 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.2 + 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 # install custom pylode 2.x (adds sorted collections, diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 70288325..a18787e0 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -67,7 +67,7 @@ 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.2 + 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 # install custom pylode 2.x diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 33a6a7b0..69ea6ab8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -61,7 +61,7 @@ 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.2 + 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 # install custom pylode 2.x diff --git a/justfile b/justfile index 5055c78d..b8278836 100644 --- a/justfile +++ b/justfile @@ -11,6 +11,7 @@ # Else download it from https://git-scm.com/download/win export GITHUB_ENV := datetime("%Y-%m-%dT%H%M") +set windows-shell := ["C:\\Program Files\\Git\\bin\\sh.exe","-c"] # List all commands as default command. The prefix "_" hides the command. _default: diff --git a/templates/README.md b/templates/README.md index e7d509f9..091a02f7 100644 --- a/templates/README.md +++ b/templates/README.md @@ -1,11 +1,11 @@ ## Excel templates -With version v1.0.0 of voc4cat-tool xlsx-templates have become optional. +With the release of version v1.0.0 of voc4cat-tool xlsx-templates have become optional. Use this folder to provide your own custom template, for example, with a help or an about sheet. If you name the template `default_sheets.xlsx` it will be picked up automatically (this name is pre-configured in gh-actions). -Note that templates may not contain any of the sheets that are dynamically created in v1.0.0. +Note that templates may not contain any of the sheets that are dynamically created since v1.0.0. Therefore, **earlier template versions cannot be used** without adaption, see [documentation](https://nfdi4cat.github.io/voc4cat-tool/migration-to-v1.0.html#step-4-generate-v1-0-excel-template).