Merge branch 'main' into feature-nc-preferred-chunks

.codecov.yml

@@ -1,16 +1,38 @@
 codecov:
-  ci:
-    # by default, codecov doesn't recognize azure as a CI provider
-    - dev.azure.com
-  require_ci_to_pass: yes
+  require_ci_to_pass: true
 
 coverage:
   status:
     project:
       default:
         # Require 1% coverage, i.e., always succeed
-        target: 1
+        target: 1%
+        flags:
+          - unittests
+        paths:
+         - "!xarray/tests/"
+      unittests:
+        target: 90%
+        flags:
+          - unittests
+        paths:
+          - "!xarray/tests/"
+      mypy:
+        target: 20%
+        flags:
+          - mypy
     patch: false
     changes: false
 
-comment: off
+comment: false
+
+flags:
+  unittests:
+    paths:
+      - "xarray"
+      - "!xarray/tests"
+    carryforward: false
+  mypy:
+    paths:
+      - "xarray"
+    carryforward: false

.github/workflows/ci-additional.yaml

@@ -123,7 +123,7 @@ jobs:
 
       - name: Run mypy
         run: |
-          python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
+          python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report xarray/
 
       - name: Upload mypy coverage to Codecov
         uses: codecov/[email protected]
@@ -177,7 +177,7 @@ jobs:
 
       - name: Run mypy
         run: |
-          python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report
+          python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report xarray/
 
       - name: Upload mypy coverage to Codecov
         uses: codecov/[email protected]

.github/workflows/ci.yaml

@@ -42,7 +42,7 @@ jobs:
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
         # Bookend python versions
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.11"]
         env: [""]
         include:
           # Minimum python version:

.github/workflows/pypi-release.yaml

@@ -88,7 +88,7 @@ jobs:
           path: dist
       - name: Publish package to TestPyPI
         if: github.event_name == 'push'
-        uses: pypa/[email protected].8
+        uses: pypa/[email protected].10
         with:
           repository_url: https://test.pypi.org/legacy/
           verbose: true
@@ -111,6 +111,6 @@ jobs:
           name: releases
           path: dist
       - name: Publish package to PyPI
-        uses: pypa/[email protected].8
+        uses: pypa/[email protected].10
         with:
           verbose: true

.pre-commit-config.yaml

@@ -1,4 +1,6 @@
 # https://pre-commit.com/
+ci:
+    autoupdate_schedule: monthly
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
@@ -16,7 +18,7 @@ repos:
         files: ^xarray/
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: 'v0.0.280'
+    rev: 'v0.0.287'
     hooks:
       - id: ruff
         args: ["--fix"]
@@ -33,7 +35,7 @@ repos:
         additional_dependencies: ["black==23.7.0"]
       - id: blackdoc-autoupdate-black
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.4.1
+    rev: v1.5.1
     hooks:
       - id: mypy
         # Copied from setup.cfg

README.md

@@ -1,7 +1,7 @@
 # xarray: N-D labeled arrays and datasets
 
 [![CI](https://github.com/pydata/xarray/workflows/CI/badge.svg?branch=main)](https://github.com/pydata/xarray/actions?query=workflow%3ACI)
-[![Code coverage](https://codecov.io/gh/pydata/xarray/branch/main/graph/badge.svg)](https://codecov.io/gh/pydata/xarray)
+[![Code coverage](https://codecov.io/gh/pydata/xarray/branch/main/graph/badge.svg?flag=unittests)](https://codecov.io/gh/pydata/xarray)
 [![Docs](https://readthedocs.org/projects/xray/badge/?version=latest)](https://docs.xarray.dev/)
 [![Benchmarked with asv](https://img.shields.io/badge/benchmarked%20by-asv-green.svg?style=flat)](https://pandas.pydata.org/speed/xarray/)
 [![Available on pypi](https://img.shields.io/pypi/v/xarray.svg)](https://pypi.python.org/pypi/xarray/)

ci/min_deps_check.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """Fetch from conda database all available versions of the xarray dependencies and their
-publication date. Compare it against requirements/py37-min-all-deps.yml to verify the
+publication date. Compare it against requirements/min-all-deps.yml to verify the
 policy on obsolete dependencies is being followed. Print a pretty report :)
 """
 import itertools
@@ -46,7 +46,7 @@ def warning(msg: str) -> None:
 
 
 def parse_requirements(fname) -> Iterator[tuple[str, int, int, int | None]]:
-    """Load requirements/py37-min-all-deps.yml
+    """Load requirements/min-all-deps.yml
 
     Yield (package name, major version, minor version, [patch version])
     """

ci/requirements/all-but-dask.yml

@@ -23,7 +23,7 @@ dependencies:
   - netcdf4
   - numba
   - numbagg
-  - numpy<1.24
+  - numpy
   - packaging
   - pandas
   - pint<0.21

ci/requirements/bare-minimum.yml

@@ -11,6 +11,6 @@ dependencies:
   - pytest-env
   - pytest-xdist
   - pytest-timeout
-  - numpy=1.21
+  - numpy=1.22
   - packaging=21.3
   - pandas=1.4

ci/requirements/doc.yml

@@ -19,7 +19,7 @@ dependencies:
   - nbsphinx
   - netcdf4>=1.5
   - numba
-  - numpy>=1.21,<1.24
+  - numpy>=1.21
   - packaging>=21.3
   - pandas>=1.4
   - pooch

ci/requirements/environment-windows.yml

@@ -22,7 +22,7 @@ dependencies:
   - netcdf4
   - numba
   - numbagg
-  - numpy<1.24
+  - numpy
   - packaging
   - pandas
   - pint<0.21

ci/requirements/environment.yml

@@ -25,7 +25,7 @@ dependencies:
   - numba
   - numbagg
   - numexpr
-  - numpy<1.24
+  - numpy
   - packaging
   - pandas
   - pint<0.21

ci/requirements/min-all-deps.yml

@@ -8,48 +8,48 @@ dependencies:
   # When upgrading python, numpy, or pandas, must also change
   # doc/user-guide/installing.rst, doc/user-guide/plotting.rst and setup.py.
   - python=3.9
-  - boto3=1.20
+  - boto3=1.24
   - bottleneck=1.3
   - cartopy=0.20
   - cdms2=3.1
-  - cftime=1.5
+  - cftime=1.6
   - coveralls
-  - dask-core=2022.1
-  - distributed=2022.1
+  - dask-core=2022.7
+  - distributed=2022.7
   - flox=0.5
-  - h5netcdf=0.13
+  - h5netcdf=1.0
   # h5py and hdf5 tend to cause conflicts
   # for e.g. hdf5 1.12 conflicts with h5py=3.1
   # prioritize bumping other packages instead
   - h5py=3.6
   - hdf5=1.12
   - hypothesis
-  - iris=3.1
-  - lxml=4.7  # Optional dep of pydap
+  - iris=3.2
+  - lxml=4.9  # Optional dep of pydap
   - matplotlib-base=3.5
   - nc-time-axis=1.4
   # netcdf follows a 1.major.minor[.patch] convention
   # (see https://github.com/Unidata/netcdf4-python/issues/1090)
-  - netcdf4=1.5.7
+  - netcdf4=1.6.0
   - numba=0.55
-  - numpy=1.21
+  - numpy=1.22
   - packaging=21.3
   - pandas=1.4
-  - pint=0.18
+  - pint=0.19
   - pip
   - pseudonetcdf=3.2
-  - pydap=3.2
+  - pydap=3.3
   - pytest
   - pytest-cov
   - pytest-env
   - pytest-xdist
   - pytest-timeout
-  - rasterio=1.2
-  - scipy=1.7
+  - rasterio=1.3
+  - scipy=1.8
   - seaborn=0.11
   - sparse=0.13
-  - toolz=0.11
-  - typing_extensions=4.0
-  - zarr=2.10
+  - toolz=0.12
+  - typing_extensions=4.3
+  - zarr=2.12
   - pip:
-    - numbagg==0.1
+    - numbagg==0.2.1