Skip to content

Commit 77f0e0e

Browse files
committed
Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-numpy-groupies
* upstream/main: (27 commits) Generator for groupby reductions (pydata#5871) 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) Add typing_extensions as a required dependency (pydata#5911) ...
2 parents 0f2c59f + 1ecf91a commit 77f0e0e

Some content is hidden

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

65 files changed

+5437
-798
lines changed

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

Lines changed: 3 additions & 3 deletions
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,

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ repos:
2121
rev: v0.3.4
2222
hooks:
2323
- id: blackdoc
24+
exclude: "generate_reductions.py"
2425
- repo: https://gitlab.com/pycqa/flake8
2526
rev: 3.9.2
2627
hooks:

ci/min_deps_check.py

Lines changed: 3 additions & 11 deletions
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/environment-windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ dependencies:
3939
- setuptools
4040
- sparse
4141
- toolz
42+
- typing_extensions
4243
- zarr
4344
- pip:
4445
- numbagg

ci/requirements/environment.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ dependencies:
4343
- setuptools
4444
- sparse
4545
- toolz
46+
- typing_extensions
4647
- zarr
4748
- pip:
4849
- numbagg

ci/requirements/py37-bare-minimum.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +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
15+
- typing_extensions=3.7
16+
- importlib-metadata=2.0

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

Lines changed: 18 additions & 15 deletions
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,11 +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
50-
- zarr=2.4
48+
- scipy=1.5
49+
- seaborn=0.11
50+
- sparse=0.11
51+
- toolz=0.11
52+
- typing_extensions=3.7
53+
- zarr=2.5
5154
- pip:
5255
- numbagg==0.1

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ dependencies:
3939
- setuptools
4040
- sparse
4141
- toolz
42+
- typing_extensions
4243
- zarr
4344
- pip:
4445
- numbagg

0 commit comments

Comments
 (0)