Merge branch 'main' into dependabot/github_actions/conda-incubator/se…

…tup-miniconda-3.1.0
zarr-developers · Nov 5, 2024 · 1ad2e8e · 1ad2e8e
2 parents c84b8dc + 943b092
commit 1ad2e8e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         python-version: ["3.11", "3.12", "3.13"]
         # macos-12 is an intel runner, macos-14 is a arm64 runner
-        platform: [ubuntu-latest, windows-latest, macos-12, macos-14]
+        platform: [ubuntu-latest, windows-latest, macos-13, macos-14]
 
     steps:
       - name: Checkout source
@@ -45,7 +45,7 @@ jobs:
 
       - name: Install clang
         shell: "bash -l {0}"
-        if: matrix.platform == 'macos-12'
+        if: matrix.platform == 'macos-13'
         run: |
           conda activate env
           conda install -y 'clang>=12.0.1,<17'

diff --git a/.github/workflows/wheel.yaml b/.github/workflows/wheel.yaml
@@ -13,8 +13,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # macos-12 is an intel runner, macos-14 is a arm64 runner
-        os: [ubuntu-latest, windows-latest, macos-12, macos-14]
+        # macos-13 is an intel runner, macos-14 is a arm64 runner
+        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
     env:
       CIBW_TEST_COMMAND: python -c "import numcodecs"
       CIBW_BUILD: "cp311-* cp312-* cp313-*"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -15,7 +15,7 @@ repos:
     - id: debug-statements
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.1
+    rev: v0.7.2
     hooks:
     - id: ruff
       args: ["--fix", "--show-fixes"]