Skip to content

Commit 98be7c1

Browse files
committed
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) ...
2 parents c048410 + 8102e18 commit 98be7c1

35 files changed

+1578
-305
lines changed

.github/release.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
changelog:
2+
exclude:
3+
authors:
4+
- dependabot
5+
- pre-commit-ci

.github/workflows/ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
run: |
5151
pytest -n auto --cov=./ --cov-report=xml
5252
- name: Upload code coverage to Codecov
53-
uses: codecov/codecov-action@v3.1.4
53+
uses: codecov/codecov-action@v4.5.0
5454
with:
5555
file: ./coverage.xml
5656
flags: unittests
@@ -114,7 +114,7 @@ jobs:
114114
run: |
115115
python -m mypy --install-types --non-interactive --cobertura-xml-report mypy_report cf_xarray/
116116
- name: Upload mypy coverage to Codecov
117-
uses: codecov/codecov-action@v3.1.4
117+
uses: codecov/codecov-action@v4.5.0
118118
with:
119119
file: mypy_report/cobertura.xml
120120
flags: mypy

.github/workflows/pypi.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
18-
- uses: actions/setup-python@v4
18+
- uses: actions/setup-python@v5
1919
name: Install Python
2020
with:
2121
python-version: "3.10"
@@ -41,7 +41,7 @@ jobs:
4141
else
4242
echo "✅ Looks good"
4343
fi
44-
- uses: actions/upload-artifact@v3
44+
- uses: actions/upload-artifact@v4
4545
with:
4646
name: releases
4747
path: dist
@@ -50,11 +50,11 @@ jobs:
5050
needs: build-artifacts
5151
runs-on: ubuntu-latest
5252
steps:
53-
- uses: actions/setup-python@v4
53+
- uses: actions/setup-python@v5
5454
name: Install Python
5555
with:
5656
python-version: "3.10"
57-
- uses: actions/download-artifact@v3
57+
- uses: actions/download-artifact@v4
5858
with:
5959
name: releases
6060
path: dist
@@ -72,7 +72,7 @@ jobs:
7272
7373
- name: Publish package to TestPyPI
7474
if: github.event_name == 'push'
75-
uses: pypa/gh-action-pypi-publish@v1.8.11
75+
uses: pypa/gh-action-pypi-publish@v1.9.0
7676
with:
7777
password: ${{ secrets.TESTPYPI_TOKEN }}
7878
repository_url: https://test.pypi.org/legacy/
@@ -91,11 +91,11 @@ jobs:
9191
id-token: write
9292

9393
steps:
94-
- uses: actions/download-artifact@v3
94+
- uses: actions/download-artifact@v4
9595
with:
9696
name: releases
9797
path: dist
9898
- name: Publish package to PyPI
99-
uses: pypa/gh-action-pypi-publish@v1.8.11
99+
uses: pypa/gh-action-pypi-publish@v1.9.0
100100
with:
101101
verbose: true

.github/workflows/testpypi-release.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
fetch-depth: 0
2323

24-
- uses: actions/setup-python@v4
24+
- uses: actions/setup-python@v5
2525
name: Install Python
2626
with:
2727
python-version: "3.10"
@@ -53,7 +53,7 @@ jobs:
5353
echo "✅ Looks good"
5454
fi
5555
56-
- uses: actions/upload-artifact@v3
56+
- uses: actions/upload-artifact@v4
5757
with:
5858
name: releases
5959
path: dist
@@ -62,11 +62,11 @@ jobs:
6262
needs: build-artifacts
6363
runs-on: ubuntu-latest
6464
steps:
65-
- uses: actions/setup-python@v4
65+
- uses: actions/setup-python@v5
6666
name: Install Python
6767
with:
6868
python-version: "3.10"
69-
- uses: actions/download-artifact@v3
69+
- uses: actions/download-artifact@v4
7070
with:
7171
name: releases
7272
path: dist

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
upstream-dev:
2323
name: upstream-dev
2424
runs-on: ubuntu-latest
25-
if: ${{ (contains( github.event.pull_request.labels.*.name, 'test-upstream') && github.event_name == 'pull_request') || github.event_name == 'workflow_dispatch' }}
25+
if: ${{ (contains( github.event.pull_request.labels.*.name, 'test-upstream') && github.event_name == 'pull_request') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
2626
defaults:
2727
run:
2828
shell: bash -l {0}

.pre-commit-config.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ ci:
33

44
repos:
55
- repo: https://github.com/asottile/pyupgrade
6-
rev: v3.15.0
6+
rev: v3.16.0
77
hooks:
88
- id: pyupgrade
99
args: ["--py39-plus"]
1010

1111
- repo: https://github.com/astral-sh/ruff-pre-commit
1212
# Ruff version.
13-
rev: 'v0.1.1'
13+
rev: 'v0.5.0'
1414
hooks:
1515
- id: ruff
1616
args: ["--show-fixes", "--fix"]
1717

1818
- repo: https://github.com/psf/black-pre-commit-mirror
19-
rev: 23.10.1
19+
rev: 24.4.2
2020
hooks:
2121
- id: black
2222

@@ -36,7 +36,7 @@ repos:
3636
- mdformat-myst
3737

3838
- repo: https://github.com/nbQA-dev/nbQA
39-
rev: 1.7.0
39+
rev: 1.8.5
4040
hooks:
4141
- id: nbqa-black
4242
- id: nbqa-ruff
@@ -47,7 +47,7 @@ repos:
4747
additional_dependencies: [mdformat==0.7.17]
4848

4949
- repo: https://github.com/pre-commit/pre-commit-hooks
50-
rev: v4.5.0
50+
rev: v4.6.0
5151
hooks:
5252
- id: trailing-whitespace
5353
- id: end-of-file-fixer
@@ -56,7 +56,7 @@ repos:
5656
- id: debug-statements
5757

5858
- repo: https://github.com/keewis/blackdoc
59-
rev: v0.3.8
59+
rev: v0.3.9
6060
hooks:
6161
- id: blackdoc
6262
files: .+\.py$
@@ -67,7 +67,7 @@ repos:
6767
- id: validate-cff
6868

6969
- repo: https://github.com/abravalheri/validate-pyproject
70-
rev: v0.15
70+
rev: v0.18
7171
hooks:
7272
- id: validate-pyproject
7373

cf_xarray/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@
1111

1212
from . import geometry # noqa
1313

14-
#
1514
__version__ = _get_version()

0 commit comments

Comments
 (0)