Skip to content

Commit 6246b03

Browse files
authored
Merge branch 'main' into pre-commit-ci-update-config
2 parents 62908f3 + 01e97d3 commit 6246b03

File tree

6 files changed

+417
-429
lines changed

6 files changed

+417
-429
lines changed

.github/workflows/ci-locks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ concurrency:
1818

1919
jobs:
2020
refresh_lockfiles:
21-
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2024.12.4
21+
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2025.01.3
2222
secrets: inherit

.github/workflows/ci-manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ concurrency:
2525
jobs:
2626
manifest:
2727
name: "check-manifest"
28-
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2024.12.4
28+
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2025.01.3

.github/workflows/ci-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ jobs:
5959
- name: "mambaforge setup (python ${{ matrix.python-version }})"
6060
uses: conda-incubator/setup-miniconda@v3
6161
with:
62-
miniforge-variant: Mambaforge
62+
miniforge-variant: Miniforge3
6363
miniforge-version: latest
64-
channels: conda-forge,defaults
64+
channels: conda-forge
6565
channel-priority: true
6666
auto-update-conda: true
6767
environment-file: "requirements/locks/py${{ matrix.python-version }}-linux-64.lock"

0 commit comments

Comments
 (0)