Skip to content

Commit 348191b

Browse files
authored
Merge branch 'main' into rajeeja/from_file_notebook
2 parents 3bc1158 + c30f0b0 commit 348191b

31 files changed

+76706
-63
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
os: [ "ubuntu-latest", "macos-latest", "macos-14", "windows-latest"]
22-
python-version: [ "3.9", "3.10", "3.11", "3.12"]
22+
python-version: [ "3.10", "3.11", "3.12", ]
2323
steps:
2424
- name: Cancel previous runs
2525
uses: styfle/[email protected]
@@ -75,7 +75,7 @@ jobs:
7575

7676
- name: Upload code coverage to Codecov
7777
if: github.repository == 'UXARRAY/uxarray'
78-
uses: codecov/codecov-action@v5.0.7
78+
uses: codecov/codecov-action@v5.1.1
7979
env:
8080
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
8181
with:

.github/workflows/pypi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
python -m twine check dist/*
5151
5252
- name: Publish package to PyPI
53-
uses: pypa/[email protected].2
53+
uses: pypa/[email protected].3
5454
with:
5555
skip-existing: true
5656
verbose: true

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
python-version: [ "3.11" ]
21+
python-version: [ "3.12" ]
2222

2323
steps:
2424
- name: Checkout

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repos:
1414

1515
- repo: https://github.com/astral-sh/ruff-pre-commit
1616
# Ruff version.
17-
rev: v0.8.1
17+
rev: v0.8.2
1818
hooks:
1919
# Run the linter.
2020
- id: ruff

docs/user-guide/grid-formats.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,10 @@ References
140140

141141
FESOM2
142142
======
143-
The F**inite volumE Sea Ice-Ocean Model (FESOM2) is a Multi-resolution ocean general circulation
143+
The Finite Volume Sea Ice-Ocean Model (FESOM2) is a Multi-resolution ocean general circulation
144144
model that solves the equations of motion describing the ocean and sea ice using finite-volume methods
145145
on unstructured computational grids. The model is developed and supported by researchers at the
146-
Alfred Wegener Institute, Helmholtz Centre for Polar and Marine Research (AWI), in Bremerhaven, Germany. UXarray
147-
currently supports reading the ``fesom.mesh.diag.nc`` file that is generated and encoded in the UGRID conventions.
148-
146+
Alfred Wegener Institute, Helmholtz Centre for Polar and Marine Research (AWI), in Bremerhaven, Germany.
149147

150148
References
151149
----------

pyproject.toml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,21 @@
22
classifiers=[
33
"Operating System :: OS Independent",
44
"Intended Audience :: Science/Research",
5+
"Topic :: Scientific/Engineering",
56
"Programming Language :: Python",
67
"Programming Language :: Python :: 3",
7-
"Programming Language :: Python :: 3.9",
88
"Programming Language :: Python :: 3.10",
99
"Programming Language :: Python :: 3.11",
1010
"Programming Language :: Python :: 3.12",
11-
'Operating System :: Microsoft :: Windows',
12-
'Operating System :: Unix',
13-
'Operating System :: MacOS',
14-
"Topic :: Scientific/Engineering",
1511
]
1612

1713
dynamic = ["version"]
18-
keywords = ["unstructured grids", "xarray", "ugrid", "mpas", "exodus", "scrip", ]
19-
description = "Xarray-styled package for reading and directly operating on unstructured grid datasets following UGRID conventions"
14+
keywords = ["unstructured grids", "xarray", "ugrid", "mpas", "exodus", "scrip", "fesom", "icon"]
15+
description = "Xarray extension for unstructured climate and global weather data analysis and visualization."
2016
license = {file = "LICENSE"}
2117
name = "uxarray"
2218
readme = "README.md"
23-
requires-python = ">=3.9"
19+
requires-python = ">=3.10"
2420

2521
# minimal dependencies start
2622
dependencies = [
@@ -50,7 +46,7 @@ dependencies = [
5046

5147
[project.optional-dependencies]
5248
complete = ["uxarray[math, dev]"]
53-
math = ['gmpy2', 'pyfma']
49+
math = ['gmpy2']
5450
dev = ['pathlib', 'pre_commit', 'pytest', 'pytest-cov', 'ruff', 'asv']
5551

5652
[project.urls]

0 commit comments

Comments
 (0)