Skip to content

Commit 4fe0c4e

Browse files
authored
Merge branch 'main' into indexing
2 parents 51a65de + b9c1d0c commit 4fe0c4e

File tree

4 files changed

+30
-14
lines changed

4 files changed

+30
-14
lines changed

.github/dependabot.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
# Check for updates once a week
7+
interval: "weekly"
8+
groups:
9+
actions:
10+
patterns:
11+
- "*"

.github/release.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
changelog:
2+
exclude:
3+
authors:
4+
- dependabot
5+
- pre-commit-ci

.github/workflows/ci.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
if: |
2020
github.repository == 'xarray-contrib/xarray-array-testing'
2121
&& (github.event_name == 'push' || github.event_name == 'pull_request')
22+
&& !contains(github.event.pull_request.labels.*.name, 'skip-ci')
2223
outputs:
2324
triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
2425
steps:
@@ -36,6 +37,7 @@ jobs:
3637
runs-on: ${{ matrix.os }}
3738
needs: detect-ci-trigger
3839
if: needs.detect-ci-trigger.outputs.triggered == 'false'
40+
3941
env:
4042
FORCE_COLOR: 3
4143
CONDA_ENV_FILE: "ci/requirements/environment.yaml"
@@ -47,7 +49,7 @@ jobs:
4749
fail-fast: false
4850
matrix:
4951
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
50-
python-version: ["3.11", "3.12"]
52+
python-version: ["3.11", "3.13"]
5153

5254
steps:
5355
- uses: actions/checkout@v4
@@ -63,7 +65,6 @@ jobs:
6365
cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{matrix.python-version}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}"
6466
create-args: >-
6567
python=${{matrix.python-version}}
66-
conda
6768
6869
- name: Install nightly xarray
6970
run: |
@@ -73,23 +74,22 @@ jobs:
7374
run: |
7475
python -m pip install --no-deps -e .
7576
76-
- name: Version info
77-
run: |
78-
conda info -a
79-
conda list
80-
8177
- name: Import xarray-array-testing
8278
run: |
8379
python -c 'import xarray_array_testing'
8480
8581
- name: Restore cached hypothesis directory
86-
uses: actions/cache@v4
82+
uses: actions/cache/restore@v4
8783
with:
8884
path: .hypothesis/
8985
key: cache-hypothesis
90-
enableCrossOsArchive: true
91-
save-always: true
9286

9387
- name: Run tests
9488
run: |
9589
python -m pytest --cov=xarray_array_testing
90+
91+
- name: Cache hypothesis directory
92+
uses: actions/cache/save@v4
93+
with:
94+
path: .hypothesis/
95+
key: cache-hypothesis

.pre-commit-config.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@ repos:
1212
- id: check-yaml
1313
- id: check-toml
1414
- repo: https://github.com/astral-sh/ruff-pre-commit
15-
rev: v0.9.2
15+
rev: v0.9.6
1616
hooks:
1717
- id: ruff
1818
args: [--fix]
1919
- repo: https://github.com/psf/black-pre-commit-mirror
20-
rev: 24.10.0
20+
rev: 25.1.0
2121
hooks:
2222
- id: black-jupyter
2323
- repo: https://github.com/keewis/blackdoc
2424
rev: v0.3.9
2525
hooks:
2626
- id: blackdoc
27-
additional_dependencies: ["black==24.10.0"]
27+
additional_dependencies: ["black==25.1.0"]
2828
- id: blackdoc-autoupdate-black
2929
- repo: https://github.com/kynan/nbstripout
3030
rev: 0.8.1
3131
hooks:
3232
- id: nbstripout
3333
args: [--extra-keys=metadata.kernelspec metadata.language_info.version]
3434
- repo: https://github.com/rbubley/mirrors-prettier
35-
rev: v3.4.2
35+
rev: v3.5.0
3636
hooks:
3737
- id: prettier
3838
args: [--cache-location=.prettier_cache/cache]

0 commit comments

Comments
 (0)