Skip to content

Commit ed7c1b0

Browse files
committed
Merge remote-tracking branch 'upstream/master' into rolling-sliding-window
* upstream/master: Fix regression in decoding large standard calendar times (pydata#5050) Fix sticky sidebar responsiveness on small screens (pydata#5039) Flexible indexes refactoring notes (pydata#4979) add a install xarray step to the upstream-dev CI (pydata#5044) Adds Dataset.query() method, analogous to pandas DataFrame.query() (pydata#4984) run tests on python 3.9 (pydata#5040) Add date attribute to datetime accessor (pydata#4994) 📚 New theme & rearrangement of the docs (pydata#4835) upgrade ci-trigger to the most recent version (pydata#5037) GH5005 fix documentation on open_rasterio (pydata#5021) GHA for automatically canceling previous CI runs (pydata#5025) Implement GroupBy.__getitem__ (pydata#3691) conventions: decode unsigned integers to signed if _Unsigned=false (pydata#4966) Added support for numpy.bool_ (pydata#4986) Add additional str accessor methods for DataArray (pydata#4622)
2 parents cdefb15 + fbd48d4 commit ed7c1b0

78 files changed

Lines changed: 7243 additions & 1342 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Cancel
2+
on:
3+
workflow_run:
4+
workflows: ["CI", "CI Additional", "CI Upstream"]
5+
types:
6+
- requested
7+
jobs:
8+
cancel:
9+
name: Cancel previous runs
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: styfle/cancel-workflow-action@0.8.0
13+
with:
14+
workflow_id: ${{ github.event.workflow.id }}

.github/workflows/ci-additional.yaml

Lines changed: 1 addition & 17 deletions
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: xarray-contrib/ci-trigger@v1
22+
- uses: xarray-contrib/ci-trigger@v1.1
2323
id: detect-trigger
2424
with:
2525
keyword: "[skip-ci]"
@@ -45,10 +45,6 @@ jobs:
4545
"py38-flaky",
4646
]
4747
steps:
48-
- name: Cancel previous runs
49-
uses: styfle/cancel-workflow-action@0.6.0
50-
with:
51-
access_token: ${{ github.token }}
5248
- uses: actions/checkout@v2
5349
with:
5450
fetch-depth: 0 # Fetch all history for all branches and tags.
@@ -120,10 +116,6 @@ jobs:
120116
shell: bash -l {0}
121117

122118
steps:
123-
- name: Cancel previous runs
124-
uses: styfle/cancel-workflow-action@0.6.0
125-
with:
126-
access_token: ${{ github.token }}
127119
- uses: actions/checkout@v2
128120
with:
129121
fetch-depth: 0 # Fetch all history for all branches and tags.
@@ -161,10 +153,6 @@ jobs:
161153
shell: bash -l {0}
162154

163155
steps:
164-
- name: Cancel previous runs
165-
uses: styfle/cancel-workflow-action@0.6.0
166-
with:
167-
access_token: ${{ github.token }}
168156
- uses: actions/checkout@v2
169157
with:
170158
fetch-depth: 0 # Fetch all history for all branches and tags.
@@ -205,10 +193,6 @@ jobs:
205193
shell: bash -l {0}
206194

207195
steps:
208-
- name: Cancel previous runs
209-
uses: styfle/cancel-workflow-action@0.6.0
210-
with:
211-
access_token: ${{ github.token }}
212196
- uses: actions/checkout@v2
213197
with:
214198
fetch-depth: 0 # Fetch all history for all branches and tags.

.github/workflows/ci.yaml

Lines changed: 2 additions & 6 deletions
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: xarray-contrib/ci-trigger@v1
22+
- uses: xarray-contrib/ci-trigger@v1.1
2323
id: detect-trigger
2424
with:
2525
keyword: "[skip-ci]"
@@ -35,12 +35,8 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
38-
python-version: ["3.7", "3.8"]
38+
python-version: ["3.7", "3.8", "3.9"]
3939
steps:
40-
- name: Cancel previous runs
41-
uses: styfle/cancel-workflow-action@0.6.0
42-
with:
43-
access_token: ${{ github.token }}
4440
- uses: actions/checkout@v2
4541
with:
4642
fetch-depth: 0 # Fetch all history for all branches and tags.

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

Lines changed: 7 additions & 6 deletions
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: xarray-contrib/ci-trigger@v1
24+
- uses: xarray-contrib/ci-trigger@v1.1
2525
id: detect-trigger
2626
with:
2727
keyword: "[test-upstream]"
@@ -43,15 +43,13 @@ jobs:
4343
strategy:
4444
fail-fast: false
4545
matrix:
46-
python-version: ["3.8"]
46+
python-version: ["3.9"]
4747
outputs:
4848
artifacts_availability: ${{ steps.status.outputs.ARTIFACTS_AVAILABLE }}
4949
steps:
50-
- name: Cancel previous runs
51-
uses: styfle/cancel-workflow-action@0.6.0
52-
with:
53-
access_token: ${{ github.token }}
5450
- uses: actions/checkout@v2
51+
with:
52+
fetch-depth: 0 # Fetch all history for all branches and tags.
5553
- uses: conda-incubator/setup-miniconda@v2
5654
with:
5755
channels: conda-forge
@@ -64,6 +62,9 @@ jobs:
6462
run: |
6563
mamba env update -f ci/requirements/environment.yml
6664
bash ci/install-upstream-wheels.sh
65+
- name: Install xarray
66+
run: |
67+
python -m pip install --no-deps -e .
6768
- name: Version info
6869
run: |
6970
conda info -a

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,11 @@ dask-worker-space/
6565

6666
# xarray specific
6767
doc/_build
68-
doc/generated
68+
generated/
6969
xarray/tests/data/*.grib.*.idx
7070

7171
# Sync tools
7272
Icon*
7373

7474
.ipynb_checkpoints
75+
doc/rasm.zarr

ci/install-upstream-wheels.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ conda uninstall -y --force \
1515
rasterio \
1616
pint \
1717
bottleneck \
18-
sparse
18+
sparse \
19+
xarray
1920
# to limit the runtime of Upstream CI
2021
python -m pip install pytest-timeout
2122
python -m pip install \

ci/requirements/doc.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,20 @@ dependencies:
2020
- numba
2121
- numpy>=1.17
2222
- pandas>=1.0
23+
- pip
24+
- pydata-sphinx-theme>=0.4.3
2325
- rasterio>=1.1
2426
- seaborn
2527
- setuptools
2628
- sparse
27-
- sphinx>=3.3
28-
- sphinx_rtd_theme>=0.4
2929
- sphinx-autosummary-accessors
30+
- sphinx-book-theme >= 0.0.38
31+
- sphinx-copybutton
32+
- sphinx-panels
33+
- sphinx>=3.3
3034
- zarr>=2.4
31-
- pip
3235
- pip:
33-
- scanpydoc
36+
- sphinxext-rediraffe
37+
- sphinxext-opengraph
3438
# relative to this file. Needs to be editable to be accepted.
3539
- -e ../..

ci/requirements/environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dependencies:
2222
- nc-time-axis
2323
- netcdf4
2424
- numba
25+
- numexpr
2526
- numpy
2627
- pandas
2728
- pint

0 commit comments

Comments
 (0)