Skip to content

Commit

Permalink
Merge branch 'main' into rajeeja/issue_1098
Browse files Browse the repository at this point in the history
  • Loading branch information
rajeeja committed Dec 11, 2024
2 parents e9947ab + c30f0b0 commit bcdc900
Show file tree
Hide file tree
Showing 31 changed files with 76,705 additions and 62 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fail-fast: false
matrix:
os: [ "ubuntu-latest", "macos-latest", "macos-14", "windows-latest"]
python-version: [ "3.9", "3.10", "3.11", "3.12"]
python-version: [ "3.10", "3.11", "3.12", ]
steps:
- name: Cancel previous runs
uses: styfle/[email protected]
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:

- name: Upload code coverage to Codecov
if: github.repository == 'UXARRAY/uxarray'
uses: codecov/codecov-action@v5.0.7
uses: codecov/codecov-action@v5.1.1
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
python -m twine check dist/*
- name: Publish package to PyPI
uses: pypa/[email protected].2
uses: pypa/[email protected].3
with:
skip-existing: true
verbose: true
2 changes: 1 addition & 1 deletion .github/workflows/upstream-dev-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ "3.11" ]
python-version: [ "3.12" ]

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repos:

- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.8.1
rev: v0.8.2
hooks:
# Run the linter.
- id: ruff
Expand Down
6 changes: 2 additions & 4 deletions docs/user-guide/grid-formats.rst
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,10 @@ References

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

Alfred Wegener Institute, Helmholtz Centre for Polar and Marine Research (AWI), in Bremerhaven, Germany.

References
----------
Expand Down
14 changes: 5 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,21 @@
classifiers=[
"Operating System :: OS Independent",
"Intended Audience :: Science/Research",
"Topic :: Scientific/Engineering",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
'Operating System :: Microsoft :: Windows',
'Operating System :: Unix',
'Operating System :: MacOS',
"Topic :: Scientific/Engineering",
]

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

# minimal dependencies start
dependencies = [
Expand Down Expand Up @@ -50,7 +46,7 @@ dependencies = [

[project.optional-dependencies]
complete = ["uxarray[math, dev]"]
math = ['gmpy2', 'pyfma']
math = ['gmpy2']
dev = ['pathlib', 'pre_commit', 'pytest', 'pytest-cov', 'ruff', 'asv']

[project.urls]
Expand Down
Loading

0 comments on commit bcdc900

Please sign in to comment.