Skip to content

Commit 2b1bc32

Browse files
committed
Merge remote-tracking branch 'upstream/master' into dataset/quiver
* upstream/master: FIX: h5py>=3 string decoding (pydata#4893) Update matplotlib's canonical (pydata#4919) Adding vectorized indexing docs (pydata#4711) Allow fsspec URLs in open_(mf)dataset (pydata#4823) Fix typos in example notebooks (pydata#4908) pre-commit autoupdate CI (pydata#4906) replace the ci-trigger action with a external one (pydata#4905) Update area_weighted_temperature.ipynb (pydata#4903) hide the decorator from the test traceback (pydata#4900) Sort backends (pydata#4886) Compatibility with dask 2021.02.0 (pydata#4884)
2 parents b9bcada + a8ed7ed commit 2b1bc32

29 files changed

+373
-161
lines changed

.github/actions/detect-ci-trigger/action.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/actions/detect-ci-trigger/script.sh

Lines changed: 0 additions & 47 deletions
This file was deleted.

.github/workflows/ci-additional.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v2
2020
with:
2121
fetch-depth: 2
22-
- uses: ./.github/actions/detect-ci-trigger
22+
- uses: xarray-contrib/ci-trigger@v1
2323
id: detect-trigger
2424
with:
2525
keyword: "[skip-ci]"
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: "pre-commit autoupdate CI"
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * 0" # every Sunday at 00:00 UTC
6+
workflow_dispatch:
7+
8+
9+
jobs:
10+
autoupdate:
11+
name: 'pre-commit autoupdate'
12+
runs-on: ubuntu-latest
13+
if: github.repository == 'pydata/xarray'
14+
steps:
15+
- name: checkout
16+
uses: actions/checkout@v2
17+
- name: Cache pip and pre-commit
18+
uses: actions/cache@v2
19+
with:
20+
path: |
21+
~/.cache/pre-commit
22+
~/.cache/pip
23+
key: ${{ runner.os }}-pre-commit-autoupdate
24+
- name: setup python
25+
uses: actions/setup-python@v2
26+
- name: upgrade pip
27+
run: python -m pip install --upgrade pip
28+
- name: install pre-commit
29+
run: python -m pip install --upgrade pre-commit
30+
- name: version info
31+
run: python -m pip list
32+
- name: autoupdate
33+
uses: technote-space/create-pr-action@837dbe469b39f08d416889369a52e2a993625c84
34+
with:
35+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36+
EXECUTE_COMMANDS: |
37+
python -m pre_commit autoupdate
38+
COMMIT_MESSAGE: 'pre-commit: autoupdate hook versions'
39+
PR_TITLE: 'pre-commit: autoupdate hook versions'
40+
PR_BRANCH_PREFIX: 'pre-commit/'
41+
PR_BRANCH_NAME: 'autoupdate-${PR_ID}'

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@v2
2020
with:
2121
fetch-depth: 2
22-
- uses: ./.github/actions/detect-ci-trigger
22+
- uses: xarray-contrib/ci-trigger@v1
2323
id: detect-trigger
2424
with:
2525
keyword: "[skip-ci]"

.github/workflows/upstream-dev-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v2
2222
with:
2323
fetch-depth: 2
24-
- uses: ./.github/actions/detect-ci-trigger
24+
- uses: xarray-contrib/ci-trigger@v1
2525
id: detect-trigger
2626
with:
2727
keyword: "[test-upstream]"

ci/requirements/environment-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ dependencies:
88
# - cdms2 # Not available on Windows
99
# - cfgrib # Causes Python interpreter crash on Windows: https://github.com/pydata/xarray/pull/3340
1010
- cftime
11-
- dask<2021.02.0
11+
- dask
1212
- distributed
1313
- h5netcdf
14-
- h5py=2
14+
- h5py
1515
- hdf5
1616
- hypothesis
1717
- iris

ci/requirements/environment.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ channels:
33
- conda-forge
44
- nodefaults
55
dependencies:
6+
- aiobotocore
67
- boto3
78
- bottleneck
89
- cartopy
910
- cdms2
1011
- cfgrib
1112
- cftime
12-
- dask<2021.02.0
13+
- dask
1314
- distributed
1415
- h5netcdf
15-
- h5py=2
16+
- h5py
1617
- hdf5
1718
- hypothesis
1819
- iris

ci/requirements/py38-all-but-dask.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ channels:
44
- nodefaults
55
dependencies:
66
- python=3.8
7+
- black
8+
- aiobotocore
79
- boto3
810
- bottleneck
911
- cartopy
@@ -12,7 +14,7 @@ dependencies:
1214
- cftime
1315
- coveralls
1416
- h5netcdf
15-
- h5py=2
17+
- h5py
1618
- hdf5
1719
- hypothesis
1820
- lxml # Optional dep of pydap

doc/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@
415415
"numpy": ("https://numpy.org/doc/stable", None),
416416
"scipy": ("https://docs.scipy.org/doc/scipy/reference", None),
417417
"numba": ("https://numba.pydata.org/numba-doc/latest", None),
418-
"matplotlib": ("https://matplotlib.org", None),
418+
"matplotlib": ("https://matplotlib.org/stable/", None),
419419
"dask": ("https://docs.dask.org/en/latest", None),
420420
"cftime": ("https://unidata.github.io/cftime", None),
421421
"rasterio": ("https://rasterio.readthedocs.io/en/latest", None),

0 commit comments

Comments
 (0)