Skip to content

Commit 7337ddd

Browse files
committed
Merge remote-tracking branch 'upstream/main' into groupby-plot
* upstream/main: (307 commits) Use same bool validator as other inputs (pydata#5703) conditionally disable bottleneck (pydata#5560) Refactor index vs. coordinate variable(s) (pydata#5636) pre-commit: autoupdate hook versions (pydata#5685) Flexible Indexes: Avoid len(index) in map_blocks (pydata#5670) Speed up _mapping_repr (pydata#5661) update the link to `scipy`'s intersphinx file (pydata#5665) Bump styfle/cancel-workflow-action from 0.9.0 to 0.9.1 (pydata#5663) pre-commit: autoupdate hook versions (pydata#5660) fix the binder environment (pydata#5650) Update api.rst (pydata#5639) Kwargs to rasterio open (pydata#5609) Bump codecov/codecov-action from 1 to 2.0.2 (pydata#5633) new blank whats-new for v0.19.1 v0.19.0 release notes (pydata#5632) remove deprecations scheduled for 0.19 (pydata#5630) Make typing-extensions optional (pydata#5624) Plots get labels from pint arrays (pydata#5561) Add to_numpy() and as_numpy() methods (pydata#5568) pin fsspec (pydata#5627) ...
2 parents 59b2fdc + 2705c63 commit 7337ddd

File tree

214 files changed

+23526
-7246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+23526
-7246
lines changed

.binder/environment.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: xarray-examples
22
channels:
33
- conda-forge
44
dependencies:
5-
- python=3.8
5+
- python=3.9
66
- boto3
77
- bottleneck
88
- cartopy
@@ -26,6 +26,7 @@ dependencies:
2626
- pandas
2727
- pint
2828
- pip
29+
- pooch
2930
- pydap
3031
- pynio
3132
- rasterio

.git_archival.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ref-names: $Format:%D$

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# reduce the number of merge conflicts
22
doc/whats-new.rst merge=union
3+
# allow installing from git archives
4+
.git_archival.txt export-subst

.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/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: 'github-actions'
4+
directory: '/'
5+
schedule:
6+
# Check for updates once a week
7+
interval: 'weekly'
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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+
if: github.repository == 'pydata/xarray'
12+
steps:
13+
- uses: styfle/[email protected]
14+
with:
15+
workflow_id: ${{ github.event.workflow.id }}

.github/workflows/ci-additional.yaml

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ jobs:
1212
detect-ci-trigger:
1313
name: detect ci trigger
1414
runs-on: ubuntu-latest
15-
if: github.event_name == 'push' || github.event_name == 'pull_request'
15+
if: |
16+
github.repository == 'pydata/xarray'
17+
&& (github.event_name == 'push' || github.event_name == 'pull_request')
1618
outputs:
1719
triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
1820
steps:
1921
- uses: actions/checkout@v2
2022
with:
2123
fetch-depth: 2
22-
- uses: ./.github/actions/detect-ci-trigger
24+
- uses: xarray-contrib/ci-trigger@v1.1
2325
id: detect-trigger
2426
with:
2527
keyword: "[skip-ci]"
@@ -42,26 +44,16 @@ jobs:
4244
"py37-min-all-deps",
4345
"py37-min-nep18",
4446
"py38-all-but-dask",
45-
"py38-backend-api-v2",
4647
"py38-flaky",
4748
]
4849
steps:
49-
- name: Cancel previous runs
50-
uses: styfle/[email protected]
51-
with:
52-
access_token: ${{ github.token }}
5350
- uses: actions/checkout@v2
5451
with:
5552
fetch-depth: 0 # Fetch all history for all branches and tags.
5653

5754
- name: Set environment variables
5855
run: |
59-
if [[ ${{ matrix.env }} == "py38-backend-api-v2" ]] ;
60-
then
61-
echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
62-
echo "XARRAY_BACKEND_API=v2" >> $GITHUB_ENV
63-
64-
elif [[ ${{ matrix.env }} == "py38-flaky" ]] ;
56+
if [[ ${{ matrix.env }} == "py38-flaky" ]] ;
6557
then
6658
echo "CONDA_ENV_FILE=ci/requirements/environment.yml" >> $GITHUB_ENV
6759
echo "PYTEST_EXTRA_FLAGS=--run-flaky --run-network-tests" >> $GITHUB_ENV
@@ -111,7 +103,7 @@ jobs:
111103
$PYTEST_EXTRA_FLAGS
112104
113105
- name: Upload code coverage to Codecov
114-
uses: codecov/codecov-action@v1
106+
uses: codecov/codecov-action@v2.0.2
115107
with:
116108
file: ./coverage.xml
117109
flags: unittests,${{ matrix.env }}
@@ -121,17 +113,12 @@ jobs:
121113
doctest:
122114
name: Doctests
123115
runs-on: "ubuntu-latest"
124-
needs: detect-ci-trigger
125-
if: needs.detect-ci-trigger.outputs.triggered == 'false'
116+
if: github.repository == 'pydata/xarray'
126117
defaults:
127118
run:
128119
shell: bash -l {0}
129120

130121
steps:
131-
- name: Cancel previous runs
132-
uses: styfle/[email protected]
133-
with:
134-
access_token: ${{ github.token }}
135122
- uses: actions/checkout@v2
136123
with:
137124
fetch-depth: 0 # Fetch all history for all branches and tags.
@@ -169,10 +156,6 @@ jobs:
169156
shell: bash -l {0}
170157

171158
steps:
172-
- name: Cancel previous runs
173-
uses: styfle/[email protected]
174-
with:
175-
access_token: ${{ github.token }}
176159
- uses: actions/checkout@v2
177160
with:
178161
fetch-depth: 0 # Fetch all history for all branches and tags.
@@ -186,6 +169,6 @@ jobs:
186169

187170
- name: minimum versions policy
188171
run: |
189-
mamba install -y pyyaml conda
172+
mamba install -y pyyaml conda python-dateutil
190173
python ci/min_deps_check.py ci/requirements/py37-bare-minimum.yml
191174
python ci/min_deps_check.py ci/requirements/py37-min-all-deps.yml
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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 dependencies
29+
run: python -m pip install --upgrade pre-commit pyyaml packaging
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+
python -m pre_commit run --all-files
39+
COMMIT_MESSAGE: 'pre-commit: autoupdate hook versions'
40+
COMMIT_NAME: 'github-actions[bot]'
41+
COMMIT_EMAIL: 'github-actions[bot]@users.noreply.github.com'
42+
PR_TITLE: 'pre-commit: autoupdate hook versions'
43+
PR_BRANCH_PREFIX: 'pre-commit/'
44+
PR_BRANCH_NAME: 'autoupdate-${PR_ID}'

.github/workflows/ci-pre-commit.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ jobs:
1010
linting:
1111
name: "pre-commit hooks"
1212
runs-on: ubuntu-latest
13+
if: github.repository == 'pydata/xarray'
1314
steps:
1415
- uses: actions/checkout@v2
1516
- uses: actions/setup-python@v2
16-
- uses: pre-commit/[email protected].0
17+
- uses: pre-commit/[email protected].3

0 commit comments

Comments
 (0)