Skip to content
forked from pydata/xarray

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into rolling-sliding-w…
Browse files Browse the repository at this point in the history
…indow

* 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)
  • Loading branch information
dcherian committed Mar 18, 2021
2 parents cdefb15 + fbd48d4 commit ed7c1b0
Show file tree
Hide file tree
Showing 78 changed files with 7,243 additions and 1,342 deletions.
14 changes: 14 additions & 0 deletions .github/workflows/cancel-duplicate-runs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Cancel
on:
workflow_run:
workflows: ["CI", "CI Additional", "CI Upstream"]
types:
- requested
jobs:
cancel:
name: Cancel previous runs
runs-on: ubuntu-latest
steps:
- uses: styfle/[email protected]
with:
workflow_id: ${{ github.event.workflow.id }}
18 changes: 1 addition & 17 deletions .github/workflows/ci-additional.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 2
- uses: xarray-contrib/ci-trigger@v1
- uses: xarray-contrib/ci-trigger@v1.1
id: detect-trigger
with:
keyword: "[skip-ci]"
Expand All @@ -45,10 +45,6 @@ jobs:
"py38-flaky",
]
steps:
- name: Cancel previous runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Fetch all history for all branches and tags.
Expand Down Expand Up @@ -120,10 +116,6 @@ jobs:
shell: bash -l {0}

steps:
- name: Cancel previous runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Fetch all history for all branches and tags.
Expand Down Expand Up @@ -161,10 +153,6 @@ jobs:
shell: bash -l {0}

steps:
- name: Cancel previous runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Fetch all history for all branches and tags.
Expand Down Expand Up @@ -205,10 +193,6 @@ jobs:
shell: bash -l {0}

steps:
- name: Cancel previous runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Fetch all history for all branches and tags.
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 2
- uses: xarray-contrib/ci-trigger@v1
- uses: xarray-contrib/ci-trigger@v1.1
id: detect-trigger
with:
keyword: "[skip-ci]"
Expand All @@ -35,12 +35,8 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: ["3.7", "3.8"]
python-version: ["3.7", "3.8", "3.9"]
steps:
- name: Cancel previous runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Fetch all history for all branches and tags.
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/upstream-dev-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v2
with:
fetch-depth: 2
- uses: xarray-contrib/ci-trigger@v1
- uses: xarray-contrib/ci-trigger@v1.1
id: detect-trigger
with:
keyword: "[test-upstream]"
Expand All @@ -43,15 +43,13 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8"]
python-version: ["3.9"]
outputs:
artifacts_availability: ${{ steps.status.outputs.ARTIFACTS_AVAILABLE }}
steps:
- name: Cancel previous runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Fetch all history for all branches and tags.
- uses: conda-incubator/setup-miniconda@v2
with:
channels: conda-forge
Expand All @@ -64,6 +62,9 @@ jobs:
run: |
mamba env update -f ci/requirements/environment.yml
bash ci/install-upstream-wheels.sh
- name: Install xarray
run: |
python -m pip install --no-deps -e .
- name: Version info
run: |
conda info -a
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,11 @@ dask-worker-space/

# xarray specific
doc/_build
doc/generated
generated/
xarray/tests/data/*.grib.*.idx

# Sync tools
Icon*

.ipynb_checkpoints
doc/rasm.zarr
3 changes: 2 additions & 1 deletion ci/install-upstream-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ conda uninstall -y --force \
rasterio \
pint \
bottleneck \
sparse
sparse \
xarray
# to limit the runtime of Upstream CI
python -m pip install pytest-timeout
python -m pip install \
Expand Down
12 changes: 8 additions & 4 deletions ci/requirements/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,20 @@ dependencies:
- numba
- numpy>=1.17
- pandas>=1.0
- pip
- pydata-sphinx-theme>=0.4.3
- rasterio>=1.1
- seaborn
- setuptools
- sparse
- sphinx>=3.3
- sphinx_rtd_theme>=0.4
- sphinx-autosummary-accessors
- sphinx-book-theme >= 0.0.38
- sphinx-copybutton
- sphinx-panels
- sphinx>=3.3
- zarr>=2.4
- pip
- pip:
- scanpydoc
- sphinxext-rediraffe
- sphinxext-opengraph
# relative to this file. Needs to be editable to be accepted.
- -e ../..
1 change: 1 addition & 0 deletions ci/requirements/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ dependencies:
- nc-time-axis
- netcdf4
- numba
- numexpr
- numpy
- pandas
- pint
Expand Down
Loading

0 comments on commit ed7c1b0

Please sign in to comment.