Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into groupby-aggs-using-…
Browse files Browse the repository at this point in the history
…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)
  ...
  • Loading branch information
dcherian committed Nov 5, 2021
2 parents 0f2c59f + 1ecf91a commit 77f0e0e
Show file tree
Hide file tree
Showing 65 changed files with 5,437 additions and 798 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/upstream-dev-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
shopt -s globstar
python .github/workflows/parse_logs.py logs/**/*-log
- name: Report failures
uses: actions/github-script@v4.1
uses: actions/github-script@v5
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down Expand Up @@ -158,15 +158,15 @@ jobs:
// If no issue is open, create a new issue,
// else update the body of the existing issue.
if (result.repository.issues.edges.length === 0) {
github.issues.create({
github.rest.issues.create({
owner: variables.owner,
repo: variables.name,
body: issue_body,
title: title,
labels: [variables.label]
})
} else {
github.issues.update({
github.rest.issues.update({
owner: variables.owner,
repo: variables.name,
issue_number: result.repository.issues.edges[0].node.number,
Expand Down
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ repos:
rev: v0.3.4
hooks:
- id: blackdoc
exclude: "generate_reductions.py"
- repo: https://gitlab.com/pycqa/flake8
rev: 3.9.2
hooks:
Expand Down
14 changes: 3 additions & 11 deletions ci/min_deps_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,16 @@
"isort",
"mypy",
"pip",
"setuptools",
"pytest",
"pytest-cov",
"pytest-env",
"pytest-xdist",
}

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


Expand Down
1 change: 1 addition & 0 deletions ci/requirements/environment-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ dependencies:
- setuptools
- sparse
- toolz
- typing_extensions
- zarr
- pip:
- numbagg
Expand Down
1 change: 1 addition & 0 deletions ci/requirements/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ dependencies:
- setuptools
- sparse
- toolz
- typing_extensions
- zarr
- pip:
- numbagg
Expand Down
7 changes: 4 additions & 3 deletions ci/requirements/py37-bare-minimum.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ dependencies:
- pytest-cov
- pytest-env
- pytest-xdist
- numpy=1.17
- pandas=1.0
- setuptools=40.4
- numpy=1.18
- pandas=1.1
- typing_extensions=3.7
- importlib-metadata=2.0
33 changes: 18 additions & 15 deletions ci/requirements/py37-min-all-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,32 @@ dependencies:
- python=3.7
- boto3=1.13
- bottleneck=1.3
# cartopy 0.18 conflicts with pynio
- cartopy=0.17
- cdms2=3.1
- cfgrib=0.9
- cftime=1.1
- cftime=1.2
- coveralls
- dask=2.24
- distributed=2.24
- dask=2.30
- distributed=2.30
- h5netcdf=0.8
- h5py=2.10
# hdf5 1.12 conflicts with h5py=2.10
- hdf5=1.10
- hypothesis
- iris=2.4
- lxml=4.5 # Optional dep of pydap
- matplotlib-base=3.2
- importlib-metadata=2.0
- lxml=4.6 # Optional dep of pydap
- matplotlib-base=3.3
- nc-time-axis=1.2
# netcdf follows a 1.major.minor[.patch] convention
# (see https://github.com/Unidata/netcdf4-python/issues/1090)
# bumping the netCDF4 version is currently blocked by #4491
- netcdf4=1.5.3
- numba=0.49
- numpy=1.17
- pandas=1.0
- pint=0.15
- numba=0.51
- numpy=1.18
- pandas=1.1
- pint=0.16
- pip
- pseudonetcdf=3.1
- pydap=3.2
Expand All @@ -42,11 +45,11 @@ dependencies:
- pytest-env
- pytest-xdist
- rasterio=1.1
- scipy=1.4
- seaborn=0.10
- setuptools=40.4
- sparse=0.8
- toolz=0.10
- zarr=2.4
- scipy=1.5
- seaborn=0.11
- sparse=0.11
- toolz=0.11
- typing_extensions=3.7
- zarr=2.5
- pip:
- numbagg==0.1
1 change: 1 addition & 0 deletions ci/requirements/py38-all-but-dask.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ dependencies:
- setuptools
- sparse
- toolz
- typing_extensions
- zarr
- pip:
- numbagg
Loading

0 comments on commit 77f0e0e

Please sign in to comment.