Merge branch 'main' into grid-polygons

* main: (35 commits)
  Add release.yml
  Allow encoding/decoding multiple geometries (#526)
  Rewrite unit formatter for pint 0.24 and earlier (#523)
  [pre-commit.ci] pre-commit autoupdate (#527)
  Add grid_mapping for geometries if possible (#521)
  Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.9.0 (#524)
  Bump codecov/codecov-action from 4.4.1 to 4.5.0 (#525)
  Add geometry encoding and decoding functions. (#517)
  Bump links to CF-1.11 (#519)
  Docs cleanup (#518)
  Bump codecov/codecov-action from 4.3.0 to 4.4.1 (#514)
  [pre-commit.ci] pre-commit autoupdate (#510)
  Bump pypa/gh-action-pypi-publish from 1.8.12 to 1.8.14 (#509)
  Add docs about converting between shapely and cf (#512)
  Bump codecov/codecov-action from 4.1.0 to 4.3.0 (#511)
  Fix scheduled nightly upstream test
  Bump pypa/gh-action-pypi-publish from 1.8.11 to 1.8.12 (#503)
  Bump codecov/codecov-action from 4.0.0 to 4.1.0 (#504)
  numpy 2 compat (#505)
  ruff settings: move 'ignore' to 'lint' section (#506)
  ...

.github/release.yml

@@ -0,0 +1,5 @@
+changelog:
+ exclude:
+ authors:
+ - dependabot
+ - pre-commit-ci

.github/workflows/ci.yaml

@@ -50,7 +50,7 @@ jobs:
  run: |
  pytest -n auto --cov=./ --cov-report=xml
  - name: Upload code coverage to Codecov
- uses: codecov/codecov-action@v3.1.4
+ uses: codecov/codecov-action@v4.5.0
  with:
  file: ./coverage.xml
  flags: unittests
@@ -114,7 +114,7 @@ jobs:
  run: |
  python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report cf_xarray/
  - name: Upload mypy coverage to Codecov
- uses: codecov/codecov-action@v3.1.4
+ uses: codecov/codecov-action@v4.5.0
  with:
  file: mypy_report/cobertura.xml
  flags: mypy

.github/workflows/pypi.yaml

@@ -15,7 +15,7 @@ jobs:
  - uses: actions/checkout@v4
  with:
  fetch-depth: 0
- - uses: actions/setup-python@v4
+ - uses: actions/setup-python@v5
  name: Install Python
  with:
  python-version: "3.10"
@@ -41,7 +41,7 @@ jobs:
  else
  echo "✅ Looks good"
  fi
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
  with:
  name: releases
  path: dist
@@ -50,11 +50,11 @@ jobs:
  needs: build-artifacts
  runs-on: ubuntu-latest
  steps:
- - uses: actions/setup-python@v4
+ - uses: actions/setup-python@v5
  name: Install Python
  with:
  python-version: "3.10"
- - uses: actions/download-artifact@v3
+ - uses: actions/download-artifact@v4
  with:
  name: releases
  path: dist
@@ -72,7 +72,7 @@ jobs:
 
  - name: Publish package to TestPyPI
  if: github.event_name == 'push'
- uses: pypa/gh-action-pypi-publish@v1.8.11
+ uses: pypa/gh-action-pypi-publish@v1.9.0
  with:
  password: ${{ secrets.TESTPYPI_TOKEN }}
  repository_url: https://test.pypi.org/legacy/
@@ -91,11 +91,11 @@ jobs:
  id-token: write
 
  steps:
- - uses: actions/download-artifact@v3
+ - uses: actions/download-artifact@v4
  with:
  name: releases
  path: dist
  - name: Publish package to PyPI
- uses: pypa/gh-action-pypi-publish@v1.8.11
+ uses: pypa/gh-action-pypi-publish@v1.9.0
  with:
  verbose: true

.github/workflows/testpypi-release.yaml

@@ -21,7 +21,7 @@ jobs:
  with:
  fetch-depth: 0
 
- - uses: actions/setup-python@v4
+ - uses: actions/setup-python@v5
  name: Install Python
  with:
  python-version: "3.10"
@@ -53,7 +53,7 @@ jobs:
  echo "✅ Looks good"
  fi
 
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
  with:
  name: releases
  path: dist
@@ -62,11 +62,11 @@ jobs:
  needs: build-artifacts
  runs-on: ubuntu-latest
  steps:
- - uses: actions/setup-python@v4
+ - uses: actions/setup-python@v5
  name: Install Python
  with:
  python-version: "3.10"
- - uses: actions/download-artifact@v3
+ - uses: actions/download-artifact@v4
  with:
  name: releases
  path: dist

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

@@ -22,7 +22,7 @@ jobs:
  upstream-dev:
  name: upstream-dev
  runs-on: ubuntu-latest
- if: ${{ (contains( github.event.pull_request.labels.*.name, 'test-upstream') && github.event_name == 'pull_request') || github.event_name == 'workflow_dispatch' }}
+ if: ${{ (contains( github.event.pull_request.labels.*.name, 'test-upstream') && github.event_name == 'pull_request') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
  defaults:
  run:
  shell: bash -l {0}

.pre-commit-config.yaml

@@ -3,20 +3,20 @@ ci:
 
 repos:
  - repo: https://github.com/asottile/pyupgrade
- rev: v3.15.0
+ rev: v3.16.0
  hooks:
  - id: pyupgrade
  args: ["--py39-plus"]
 
  - repo: https://github.com/astral-sh/ruff-pre-commit
  # Ruff version.
- rev: 'v0.1.1'
+ rev: 'v0.5.0'
  hooks:
  - id: ruff
  args: ["--show-fixes", "--fix"]
 
  - repo: https://github.com/psf/black-pre-commit-mirror
- rev: 23.10.1
+ rev: 24.4.2
  hooks:
  - id: black
 
@@ -36,7 +36,7 @@ repos:
  - mdformat-myst
 
  - repo: https://github.com/nbQA-dev/nbQA
- rev: 1.7.0
+ rev: 1.8.5
  hooks:
  - id: nbqa-black
  - id: nbqa-ruff
@@ -47,7 +47,7 @@ repos:
  additional_dependencies: [mdformat==0.7.17]
 
  - repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v4.5.0
+ rev: v4.6.0
  hooks:
  - id: trailing-whitespace
  - id: end-of-file-fixer
@@ -56,7 +56,7 @@ repos:
  - id: debug-statements
 
  - repo: https://github.com/keewis/blackdoc
- rev: v0.3.8
+ rev: v0.3.9
  hooks:
  - id: blackdoc
  files: .+\.py$
@@ -67,7 +67,7 @@ repos:
  - id: validate-cff
 
  - repo: https://github.com/abravalheri/validate-pyproject
- rev: v0.15
+ rev: v0.18
  hooks:
  - id: validate-pyproject
 

cf_xarray/__init__.py

@@ -11,5 +11,4 @@
 
 from . import geometry # noqa
 
-#
 __version__ = _get_version()