From 0b113046b424fe67e51239edc28a75835a6e6241 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Dec 2025 18:10:13 +0000 Subject: [PATCH 1/3] Bump the dependencies group across 1 directory with 2 updates Bumps the dependencies group with 2 updates in the / directory: [actions/checkout](https://github.com/actions/checkout) and [actions/upload-artifact](https://github.com/actions/upload-artifact). Updates `actions/checkout` from 5 to 6 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v5...v6) Updates `actions/upload-artifact` from 5 to 6 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies - dependency-name: actions/upload-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 4 ++-- .github/workflows/test.yml | 2 +- .github/workflows/validation.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dde1362..426ce9e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-24.04 steps: - name: checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: { submodules: recursive } - uses: prefix-dev/setup-pixi@v0.9.3 with: @@ -27,7 +27,7 @@ jobs: shell: pixi run bash -e {0} run: pixi run -e dev validate - name: upload data artifact - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: data-${{ github.event.pull_request.number }} path: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 40eefde..5ab0e43 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: os: ["ubuntu-latest", "macos-latest", "windows-latest"] steps: - name: checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: { submodules: recursive } - uses: prefix-dev/setup-pixi@v0.9.3 with: diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 5f0160f..916809c 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: { submodules: recursive } - uses: prefix-dev/setup-pixi@v0.9.3 with: From 29ee55d26835d465e40d8cc5b3d0b2ab3295f19e Mon Sep 17 00:00:00 2001 From: Albert Engstfeld Date: Mon, 26 Jan 2026 14:52:22 +0100 Subject: [PATCH 2/3] Test fixing macos workflows --- pixi.lock | 17 +++++++++++++++-- pyproject.toml | 7 ++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pixi.lock b/pixi.lock index 43f2ba6..29b79d7 100644 --- a/pixi.lock +++ b/pixi.lock @@ -5,6 +5,8 @@ environments: - url: https://conda.anaconda.org/conda-forge/ indexes: - https://pypi.org/simple + options: + pypi-prerelease-mode: if-necessary-or-explicit packages: linux-64: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 @@ -587,6 +589,8 @@ environments: - url: https://conda.anaconda.org/conda-forge/ indexes: - https://pypi.org/simple + options: + pypi-prerelease-mode: if-necessary-or-explicit packages: linux-64: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 @@ -1406,6 +1410,8 @@ environments: - url: https://conda.anaconda.org/conda-forge/ indexes: - https://pypi.org/simple + options: + pypi-prerelease-mode: if-necessary-or-explicit packages: linux-64: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 @@ -2014,6 +2020,8 @@ environments: - url: https://conda.anaconda.org/conda-forge/ indexes: - https://pypi.org/simple + options: + pypi-prerelease-mode: if-necessary-or-explicit packages: linux-64: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 @@ -2625,6 +2633,8 @@ environments: - url: https://conda.anaconda.org/conda-forge/ indexes: - https://pypi.org/simple + options: + pypi-prerelease-mode: if-necessary-or-explicit packages: linux-64: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 @@ -3244,6 +3254,8 @@ environments: - url: https://conda.anaconda.org/conda-forge/ indexes: - https://pypi.org/simple + options: + pypi-prerelease-mode: if-necessary-or-explicit packages: linux-64: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 @@ -3860,6 +3872,8 @@ environments: - url: https://conda.anaconda.org/conda-forge/ indexes: - https://pypi.org/simple + options: + pypi-prerelease-mode: if-necessary-or-explicit packages: linux-64: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 @@ -7633,11 +7647,10 @@ packages: - pypi: ./ name: echemdb-ecdata version: 0.5.1 - sha256: 1914ec7a5635a7134123d87d7a9555ffd23fec542654cc52d917ed510055546f + sha256: bcd5fe928e4b9e073c9192efa39d12d8246ed641fa4d47aefeae81ad82b2b8ae requires_dist: - svgdigitizer>=0.13.0,<0.14.0 requires_python: '>=3.9' - editable: true - conda: https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.3.0-pyhd8ed1ab_0.conda sha256: ce61f4f99401a4bd455b89909153b40b9c823276aefcbb06f2044618696009ca md5: 72e42d28960d875c7654614f8b50939a diff --git a/pyproject.toml b/pyproject.toml index 993d289..e211a28 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ packages = [ "echemdb_ecdata", ] -[tool.pixi.project] +[tool.pixi.workspace] channels = ["conda-forge"] platforms = ["linux-64", "osx-64", "win-64"] @@ -66,8 +66,9 @@ pytest-remotedata = "*" convert = "cd data && make -j$(nproc)" # To validate the metadata against a specific version preceded the version by `tags` such as `tags/0.3.1`. # To validate the metadata against metadata in a specific branch use `head/branch-name`. -validate = { args = [ { "arg" = "version", "default" = "tags/0.3.1" } ],cmd = "check-jsonschema --schemafile https://raw.githubusercontent.com/echemdb/metadata-schema/refs/{{ version }}/schemas/echemdb_package.json --base-uri https://raw.githubusercontent.com/echemdb/metadata-schema/refs/{{ version }}/schemas/echemdb_package.json --no-cache $(find ./data/generated/svgdigitizer/ -type f -name '*.json')" } -validate-yaml = { args = [ { "arg" = "version", "default" = "tags/0.3.1" } ], cmd = "check-jsonschema --schemafile https://raw.githubusercontent.com/echemdb/metadata-schema/refs/{{ version }}/schemas/svgdigitizer.json --base-uri https://raw.githubusercontent.com/echemdb/metadata-schema/refs/{{ version }}/schemas/svgdigitizer.json --no-cache $(find ./literature/svgdigitizer/ -type f -name '*.yaml')" } +# Run `check-jsonschema` only if JSON files exist; otherwise print a message. +validate = { args = [ { "arg" = "version", "default" = "tags/0.3.2" } ], cmd = "sh -c \"if find ./data/generated/svgdigitizer/ -type f -name '*.json' -print -quit 2>/dev/null | grep -q .; then find ./data/generated/svgdigitizer/ -type f -name '*.json' -print0 | xargs -0 check-jsonschema --schemafile https://raw.githubusercontent.com/echemdb/metadata-schema/refs/{{ version }}/schemas/echemdb_package.json --base-uri https://raw.githubusercontent.com/echemdb/metadata-schema/refs/{{ version }}/schemas/echemdb_package.json --no-cache; else echo 'No JSON files to validate'; fi\"" } +validate-yaml = { args = [ { "arg" = "version", "default" = "tags/0.3.2" } ], cmd = "sh -c \"if find ./literature/svgdigitizer/ -type f -name '*.yaml' -print -quit 2>/dev/null | grep -q .; then find ./literature/svgdigitizer/ -type f -name '*.yaml' -print0 | xargs -0 check-jsonschema --schemafile https://raw.githubusercontent.com/echemdb/metadata-schema/refs/{{ version }}/schemas/svgdigitizer.json --base-uri https://raw.githubusercontent.com/echemdb/metadata-schema/refs/{{ version }}/schemas/svgdigitizer.json --no-cache; else echo 'No YAML files to validate'; fi\"" } doctest = "pytest -n auto --doctest-modules echemdb_ecdata" [tool.pixi.feature.lint.dependencies] From 9d788f2bdc985be376e4a173fa5536b81f4b04ce Mon Sep 17 00:00:00 2001 From: Albert Engstfeld Date: Mon, 26 Jan 2026 15:02:52 +0100 Subject: [PATCH 3/3] fix pixi version in workflows --- .github/workflows/build.yml | 2 +- .github/workflows/test.yml | 2 +- .github/workflows/validation.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 426ce9e..c0ec968 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: with: { submodules: recursive } - uses: prefix-dev/setup-pixi@v0.9.3 with: - pixi-version: v0.49.0 + pixi-version: v0.63.2 - name: digitize shell: pixi run bash -e {0} run: pixi run -e dev convert diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5ab0e43..3903bc4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ jobs: with: { submodules: recursive } - uses: prefix-dev/setup-pixi@v0.9.3 with: - pixi-version: v0.49.0 + pixi-version: v0.63.2 - name: doctest shell: pixi run bash -e {0} run: pixi run -e ${{ matrix.environment }} doctest diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 916809c..3dd4032 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -17,7 +17,7 @@ jobs: with: { submodules: recursive } - uses: prefix-dev/setup-pixi@v0.9.3 with: - pixi-version: v0.49.0 + pixi-version: v0.63.2 - name: validate input yaml shell: pixi run bash -e {0} run: pixi run -e dev validate-yaml