Skip to content

Commit 1ad2e8e

Browse files
authored
Merge branch 'main' into dependabot/github_actions/conda-incubator/setup-miniconda-3.1.0
2 parents c84b8dc + 943b092 commit 1ad2e8e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
matrix:
1515
python-version: ["3.11", "3.12", "3.13"]
1616
# macos-12 is an intel runner, macos-14 is a arm64 runner
17-
platform: [ubuntu-latest, windows-latest, macos-12, macos-14]
17+
platform: [ubuntu-latest, windows-latest, macos-13, macos-14]
1818

1919
steps:
2020
- name: Checkout source
@@ -45,7 +45,7 @@ jobs:
4545
4646
- name: Install clang
4747
shell: "bash -l {0}"
48-
if: matrix.platform == 'macos-12'
48+
if: matrix.platform == 'macos-13'
4949
run: |
5050
conda activate env
5151
conda install -y 'clang>=12.0.1,<17'

.github/workflows/wheel.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
# macos-12 is an intel runner, macos-14 is a arm64 runner
17-
os: [ubuntu-latest, windows-latest, macos-12, macos-14]
16+
# macos-13 is an intel runner, macos-14 is a arm64 runner
17+
os: [ubuntu-latest, windows-latest, macos-13, macos-14]
1818
env:
1919
CIBW_TEST_COMMAND: python -c "import numcodecs"
2020
CIBW_BUILD: "cp311-* cp312-* cp313-*"

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repos:
1515
- id: debug-statements
1616

1717
- repo: https://github.com/astral-sh/ruff-pre-commit
18-
rev: v0.7.1
18+
rev: v0.7.2
1919
hooks:
2020
- id: ruff
2121
args: ["--fix", "--show-fixes"]

0 commit comments

Comments
 (0)