Skip to content
forked from pydata/xarray

Commit 5cabd19

Browse files
committed
Merge remote-tracking branch 'upstream/main' into groupby-reduce
* upstream/main: whats-new dev whats-new for 0.20.1 (pydata#5943) Docs: fix URL for PTSA (pydata#5935) Fix a missing @requires_zarr in tests (pydata#5936) fix the detection of backend entrypoints (pydata#5931) Explicitly list all reductions in api.rst (pydata#5903) DOC: add names of missing contributors to 0.20.0 (pydata#5932) new whats-new.rst section Update open_rasterio deprecation version number (pydata#5916) v0.20 Release notes (pydata#5924) [skip-ci] v0.20.0: whats-new for release (pydata#5905) Update minimum dependencies for 0.20 (pydata#5917) Bump actions/github-script from 4.1 to 5 (pydata#5826) remove requirement for setuptools.pkg_resources (pydata#5845) Update docstring for apply_ufunc, set_options (pydata#5904) Display coords' units for slice plots (pydata#5847) Combine by coords dataarray bugfix (pydata#5834) Add .chunksizes property (pydata#5900)
2 parents 8106a4a + f469e22 commit 5cabd19

Some content is hidden

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

44 files changed

+964
-652
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
shopt -s globstar
123123
python .github/workflows/parse_logs.py logs/**/*-log
124124
- name: Report failures
125-
uses: actions/github-script@v4.1
125+
uses: actions/github-script@v5
126126
with:
127127
github-token: ${{ secrets.GITHUB_TOKEN }}
128128
script: |
@@ -158,15 +158,15 @@ jobs:
158158
// If no issue is open, create a new issue,
159159
// else update the body of the existing issue.
160160
if (result.repository.issues.edges.length === 0) {
161-
github.issues.create({
161+
github.rest.issues.create({
162162
owner: variables.owner,
163163
repo: variables.name,
164164
body: issue_body,
165165
title: title,
166166
labels: [variables.label]
167167
})
168168
} else {
169-
github.issues.update({
169+
github.rest.issues.update({
170170
owner: variables.owner,
171171
repo: variables.name,
172172
issue_number: result.repository.issues.edges[0].node.number,

ci/min_deps_check.py

+3-11
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,16 @@
2020
"isort",
2121
"mypy",
2222
"pip",
23+
"setuptools",
2324
"pytest",
2425
"pytest-cov",
2526
"pytest-env",
2627
"pytest-xdist",
2728
}
2829

29-
POLICY_MONTHS = {"python": 24, "numpy": 18, "setuptools": 42}
30+
POLICY_MONTHS = {"python": 24, "numpy": 18}
3031
POLICY_MONTHS_DEFAULT = 12
31-
POLICY_OVERRIDE = {
32-
# setuptools-scm doesn't work with setuptools < 36.7 (Nov 2017).
33-
# The conda metadata is malformed for setuptools < 38.4 (Jan 2018)
34-
# (it's missing a timestamp which prevents this tool from working).
35-
# setuptools < 40.4 (Sep 2018) from conda-forge cannot be installed into a py37
36-
# environment
37-
# TODO remove this special case and the matching note in installing.rst
38-
# after March 2022.
39-
"setuptools": (40, 4),
40-
}
32+
POLICY_OVERRIDE: Dict[str, Tuple[int, int]] = {}
4133
has_errors = False
4234

4335

ci/requirements/py37-bare-minimum.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies:
1010
- pytest-cov
1111
- pytest-env
1212
- pytest-xdist
13-
- numpy=1.17
14-
- pandas=1.0
15-
- setuptools=40.4
13+
- numpy=1.18
14+
- pandas=1.1
1615
- typing_extensions=3.7
16+
- importlib-metadata=2.0

ci/requirements/py37-min-all-deps.yml

+17-15
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,32 @@ dependencies:
1010
- python=3.7
1111
- boto3=1.13
1212
- bottleneck=1.3
13+
# cartopy 0.18 conflicts with pynio
1314
- cartopy=0.17
1415
- cdms2=3.1
1516
- cfgrib=0.9
16-
- cftime=1.1
17+
- cftime=1.2
1718
- coveralls
18-
- dask=2.24
19-
- distributed=2.24
19+
- dask=2.30
20+
- distributed=2.30
2021
- h5netcdf=0.8
2122
- h5py=2.10
23+
# hdf5 1.12 conflicts with h5py=2.10
2224
- hdf5=1.10
2325
- hypothesis
2426
- iris=2.4
25-
- lxml=4.5 # Optional dep of pydap
26-
- matplotlib-base=3.2
27+
- importlib-metadata=2.0
28+
- lxml=4.6 # Optional dep of pydap
29+
- matplotlib-base=3.3
2730
- nc-time-axis=1.2
2831
# netcdf follows a 1.major.minor[.patch] convention
2932
# (see https://github.com/Unidata/netcdf4-python/issues/1090)
3033
# bumping the netCDF4 version is currently blocked by #4491
3134
- netcdf4=1.5.3
32-
- numba=0.49
33-
- numpy=1.17
34-
- pandas=1.0
35-
- pint=0.15
35+
- numba=0.51
36+
- numpy=1.18
37+
- pandas=1.1
38+
- pint=0.16
3639
- pip
3740
- pseudonetcdf=3.1
3841
- pydap=3.2
@@ -42,12 +45,11 @@ dependencies:
4245
- pytest-env
4346
- pytest-xdist
4447
- rasterio=1.1
45-
- scipy=1.4
46-
- seaborn=0.10
47-
- setuptools=40.4
48-
- sparse=0.8
49-
- toolz=0.10
48+
- scipy=1.5
49+
- seaborn=0.11
50+
- sparse=0.11
51+
- toolz=0.11
5052
- typing_extensions=3.7
51-
- zarr=2.4
53+
- zarr=2.5
5254
- pip:
5355
- numbagg==0.1

doc/api-hidden.rst

-208
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,6 @@
99
.. autosummary::
1010
:toctree: generated/
1111

12-
Dataset.nbytes
13-
Dataset.chunks
14-
15-
Dataset.all
16-
Dataset.any
17-
Dataset.argmax
18-
Dataset.argmin
19-
Dataset.idxmax
20-
Dataset.idxmin
21-
Dataset.max
22-
Dataset.min
23-
Dataset.mean
24-
Dataset.median
25-
Dataset.prod
26-
Dataset.sum
27-
Dataset.std
28-
Dataset.var
29-
3012
core.coordinates.DatasetCoordinates.get
3113
core.coordinates.DatasetCoordinates.items
3214
core.coordinates.DatasetCoordinates.keys
@@ -39,84 +21,13 @@
3921
core.coordinates.DatasetCoordinates.indexes
4022
core.coordinates.DatasetCoordinates.variables
4123

42-
core.rolling.DatasetCoarsen.all
43-
core.rolling.DatasetCoarsen.any
44-
core.rolling.DatasetCoarsen.construct
45-
core.rolling.DatasetCoarsen.count
46-
core.rolling.DatasetCoarsen.max
47-
core.rolling.DatasetCoarsen.mean
48-
core.rolling.DatasetCoarsen.median
49-
core.rolling.DatasetCoarsen.min
50-
core.rolling.DatasetCoarsen.prod
51-
core.rolling.DatasetCoarsen.reduce
52-
core.rolling.DatasetCoarsen.std
53-
core.rolling.DatasetCoarsen.sum
54-
core.rolling.DatasetCoarsen.var
5524
core.rolling.DatasetCoarsen.boundary
5625
core.rolling.DatasetCoarsen.coord_func
5726
core.rolling.DatasetCoarsen.obj
5827
core.rolling.DatasetCoarsen.side
5928
core.rolling.DatasetCoarsen.trim_excess
6029
core.rolling.DatasetCoarsen.windows
6130

62-
core.groupby.DatasetGroupBy.assign
63-
core.groupby.DatasetGroupBy.assign_coords
64-
core.groupby.DatasetGroupBy.first
65-
core.groupby.DatasetGroupBy.last
66-
core.groupby.DatasetGroupBy.fillna
67-
core.groupby.DatasetGroupBy.quantile
68-
core.groupby.DatasetGroupBy.where
69-
core.groupby.DatasetGroupBy.all
70-
core.groupby.DatasetGroupBy.any
71-
core.groupby.DatasetGroupBy.count
72-
core.groupby.DatasetGroupBy.max
73-
core.groupby.DatasetGroupBy.mean
74-
core.groupby.DatasetGroupBy.median
75-
core.groupby.DatasetGroupBy.min
76-
core.groupby.DatasetGroupBy.prod
77-
core.groupby.DatasetGroupBy.std
78-
core.groupby.DatasetGroupBy.sum
79-
core.groupby.DatasetGroupBy.var
80-
core.groupby.DatasetGroupBy.dims
81-
core.groupby.DatasetGroupBy.groups
82-
83-
core.resample.DatasetResample.all
84-
core.resample.DatasetResample.any
85-
core.resample.DatasetResample.apply
86-
core.resample.DatasetResample.assign
87-
core.resample.DatasetResample.assign_coords
88-
core.resample.DatasetResample.bfill
89-
core.resample.DatasetResample.count
90-
core.resample.DatasetResample.ffill
91-
core.resample.DatasetResample.fillna
92-
core.resample.DatasetResample.first
93-
core.resample.DatasetResample.last
94-
core.resample.DatasetResample.map
95-
core.resample.DatasetResample.max
96-
core.resample.DatasetResample.mean
97-
core.resample.DatasetResample.median
98-
core.resample.DatasetResample.min
99-
core.resample.DatasetResample.prod
100-
core.resample.DatasetResample.quantile
101-
core.resample.DatasetResample.reduce
102-
core.resample.DatasetResample.std
103-
core.resample.DatasetResample.sum
104-
core.resample.DatasetResample.var
105-
core.resample.DatasetResample.where
106-
core.resample.DatasetResample.dims
107-
core.resample.DatasetResample.groups
108-
109-
core.rolling.DatasetRolling.argmax
110-
core.rolling.DatasetRolling.argmin
111-
core.rolling.DatasetRolling.count
112-
core.rolling.DatasetRolling.max
113-
core.rolling.DatasetRolling.mean
114-
core.rolling.DatasetRolling.median
115-
core.rolling.DatasetRolling.min
116-
core.rolling.DatasetRolling.prod
117-
core.rolling.DatasetRolling.std
118-
core.rolling.DatasetRolling.sum
119-
core.rolling.DatasetRolling.var
12031
core.rolling.DatasetRolling.center
12132
core.rolling.DatasetRolling.dim
12233
core.rolling.DatasetRolling.min_periods
@@ -127,49 +38,12 @@
12738
core.weighted.DatasetWeighted.obj
12839
core.weighted.DatasetWeighted.weights
12940

130-
core.rolling_exp.RollingExp.mean
131-
132-
Dataset.argsort
133-
Dataset.astype
134-
Dataset.clip
135-
Dataset.conj
136-
Dataset.conjugate
137-
Dataset.imag
138-
Dataset.round
139-
Dataset.real
140-
Dataset.cumsum
141-
Dataset.cumprod
142-
Dataset.rank
143-
14441
Dataset.load_store
14542
Dataset.dump_to_store
14643

147-
DataArray.ndim
148-
DataArray.nbytes
149-
DataArray.shape
150-
DataArray.size
151-
DataArray.dtype
152-
DataArray.nbytes
153-
DataArray.chunks
154-
15544
DataArray.astype
15645
DataArray.item
15746

158-
DataArray.all
159-
DataArray.any
160-
DataArray.argmax
161-
DataArray.argmin
162-
DataArray.idxmax
163-
DataArray.idxmin
164-
DataArray.max
165-
DataArray.min
166-
DataArray.mean
167-
DataArray.median
168-
DataArray.prod
169-
DataArray.sum
170-
DataArray.std
171-
DataArray.var
172-
17347
core.coordinates.DataArrayCoordinates.get
17448
core.coordinates.DataArrayCoordinates.items
17549
core.coordinates.DataArrayCoordinates.keys
@@ -182,82 +56,13 @@
18256
core.coordinates.DataArrayCoordinates.indexes
18357
core.coordinates.DataArrayCoordinates.variables
18458

185-
core.rolling.DataArrayCoarsen.all
186-
core.rolling.DataArrayCoarsen.any
187-
core.rolling.DataArrayCoarsen.construct
188-
core.rolling.DataArrayCoarsen.count
189-
core.rolling.DataArrayCoarsen.max
190-
core.rolling.DataArrayCoarsen.mean
191-
core.rolling.DataArrayCoarsen.median
192-
core.rolling.DataArrayCoarsen.min
193-
core.rolling.DataArrayCoarsen.prod
194-
core.rolling.DataArrayCoarsen.reduce
195-
core.rolling.DataArrayCoarsen.std
196-
core.rolling.DataArrayCoarsen.sum
197-
core.rolling.DataArrayCoarsen.var
19859
core.rolling.DataArrayCoarsen.boundary
19960
core.rolling.DataArrayCoarsen.coord_func
20061
core.rolling.DataArrayCoarsen.obj
20162
core.rolling.DataArrayCoarsen.side
20263
core.rolling.DataArrayCoarsen.trim_excess
20364
core.rolling.DataArrayCoarsen.windows
20465

205-
core.groupby.DataArrayGroupBy.assign_coords
206-
core.groupby.DataArrayGroupBy.first
207-
core.groupby.DataArrayGroupBy.last
208-
core.groupby.DataArrayGroupBy.fillna
209-
core.groupby.DataArrayGroupBy.quantile
210-
core.groupby.DataArrayGroupBy.where
211-
core.groupby.DataArrayGroupBy.all
212-
core.groupby.DataArrayGroupBy.any
213-
core.groupby.DataArrayGroupBy.count
214-
core.groupby.DataArrayGroupBy.max
215-
core.groupby.DataArrayGroupBy.mean
216-
core.groupby.DataArrayGroupBy.median
217-
core.groupby.DataArrayGroupBy.min
218-
core.groupby.DataArrayGroupBy.prod
219-
core.groupby.DataArrayGroupBy.std
220-
core.groupby.DataArrayGroupBy.sum
221-
core.groupby.DataArrayGroupBy.var
222-
core.groupby.DataArrayGroupBy.dims
223-
core.groupby.DataArrayGroupBy.groups
224-
225-
core.resample.DataArrayResample.all
226-
core.resample.DataArrayResample.any
227-
core.resample.DataArrayResample.apply
228-
core.resample.DataArrayResample.assign_coords
229-
core.resample.DataArrayResample.bfill
230-
core.resample.DataArrayResample.count
231-
core.resample.DataArrayResample.ffill
232-
core.resample.DataArrayResample.fillna
233-
core.resample.DataArrayResample.first
234-
core.resample.DataArrayResample.last
235-
core.resample.DataArrayResample.map
236-
core.resample.DataArrayResample.max
237-
core.resample.DataArrayResample.mean
238-
core.resample.DataArrayResample.median
239-
core.resample.DataArrayResample.min
240-
core.resample.DataArrayResample.prod
241-
core.resample.DataArrayResample.quantile
242-
core.resample.DataArrayResample.reduce
243-
core.resample.DataArrayResample.std
244-
core.resample.DataArrayResample.sum
245-
core.resample.DataArrayResample.var
246-
core.resample.DataArrayResample.where
247-
core.resample.DataArrayResample.dims
248-
core.resample.DataArrayResample.groups
249-
250-
core.rolling.DataArrayRolling.argmax
251-
core.rolling.DataArrayRolling.argmin
252-
core.rolling.DataArrayRolling.count
253-
core.rolling.DataArrayRolling.max
254-
core.rolling.DataArrayRolling.mean
255-
core.rolling.DataArrayRolling.median
256-
core.rolling.DataArrayRolling.min
257-
core.rolling.DataArrayRolling.prod
258-
core.rolling.DataArrayRolling.std
259-
core.rolling.DataArrayRolling.sum
260-
core.rolling.DataArrayRolling.var
26166
core.rolling.DataArrayRolling.center
26267
core.rolling.DataArrayRolling.dim
26368
core.rolling.DataArrayRolling.min_periods
@@ -268,19 +73,6 @@
26873
core.weighted.DataArrayWeighted.obj
26974
core.weighted.DataArrayWeighted.weights
27075

271-
DataArray.argsort
272-
DataArray.clip
273-
DataArray.conj
274-
DataArray.conjugate
275-
DataArray.imag
276-
DataArray.searchsorted
277-
DataArray.round
278-
DataArray.real
279-
DataArray.T
280-
DataArray.cumsum
281-
DataArray.cumprod
282-
DataArray.rank
283-
28476
core.accessor_dt.DatetimeAccessor.ceil
28577
core.accessor_dt.DatetimeAccessor.floor
28678
core.accessor_dt.DatetimeAccessor.round

0 commit comments

Comments
 (0)