Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unpin NumPy, Pandas, ASV, Support Python 3.12, Fix Broken Install Link #883

Merged
merged 7 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .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"]
python-version: [ "3.9", "3.10", "3.11", "3.12"]
steps:
- name: Cancel previous runs
uses: styfle/cancel-workflow-action@0.12.1
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ is receptive to additional functionality requests.

[Contributor’s Guide](https://uxarray.readthedocs.io/en/latest/contributing.html)

[Installation](https://uxarray.readthedocs.io/en/latest/installation.html)
[Installation](https://uxarray.readthedocs.io/en/latest/getting-started/installation.html)

[Project Raijin Homepage](https://raijin.ucar.edu/)

Expand Down
6 changes: 3 additions & 3 deletions ci/asv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- netcdf4
- numba
- numpy
- pandas<2.1.0
- pandas
- pathlib
- pre_commit
- pyarrow
Expand All @@ -25,8 +25,8 @@ dependencies:
- shapely
- spatialpandas
- xarray
- asv
- pip:
- antimeridian
- pyfma
- git+https://github.com/airspeed-velocity/asv
- git+https://github.com/philipc2/pyfma.git # fix until https://github.com/nschloe/pyfma/pull/17 is merged
- -e ../
4 changes: 2 additions & 2 deletions ci/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ dependencies:
- holoviews
- geoviews
- cartopy
- pandas<2.1.0
- pandas
- geocat-datafiles
- spatialpandas
- pip:
- antimeridian
- pyfma
- git+https://github.com/philipc2/pyfma.git # fix until https://github.com/nschloe/pyfma/pull/17 is merged
9 changes: 4 additions & 5 deletions ci/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ dependencies:
- matplotlib-inline
- netcdf4
- numba
- numpy<2
- pandas<2.1.0
- numpy
- pandas
- pathlib
- pre_commit
- pyarrow
Expand All @@ -29,7 +29,6 @@ dependencies:
- shapely
- spatialpandas
- xarray
- asv
- pip:
- git+https://github.com/airspeed-velocity/asv
- pyfma
- git+https://github.com/airspeed-velocity/asv
- git+https://github.com/philipc2/pyfma.git # fix until https://github.com/nschloe/pyfma/pull/17 is merged
13 changes: 7 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ classifiers=[
"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"]
keywords = ["unstructured grids", "xarray", "ugrid", "mpas", "exodus", "scrip", ]
description = "Xarray-styled package for reading and directly operating on unstructured grid datasets following UGRID conventions"
license = {file = "LICENSE"}
name = "uxarray"
Expand All @@ -33,8 +34,8 @@ dependencies = [
"matplotlib-inline",
"netcdf4",
"numba",
"numpy<2.0.0",
"pandas<2.1.0",
"numpy",
"pandas",
"pyarrow",
"requests",
"scikit-learn",
Expand All @@ -48,7 +49,7 @@ dependencies = [
[project.optional-dependencies]
complete = ["uxarray[math, dev]"]
math = ['gmpy2', 'pyfma']
dev = ['pathlib', 'pre_commit', 'pytest', 'pytest-cov', 'ruff']
dev = ['pathlib', 'pre_commit', 'pytest', 'pytest-cov', 'ruff', 'asv']

[project.urls]
Documentation = "https://uxarray.readthedocs.io/"
Expand All @@ -63,8 +64,8 @@ requires = [
"setuptools-scm>=8",
]

[tool.setuptools.packages]
find = {}
[tool.setuptools]
packages = ["uxarray"]

[tool.setuptools_scm]
fallback_version = "9999"
Expand Down
2 changes: 1 addition & 1 deletion test/test_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def test_replace_fill_values_invalid(self):
"""Tests _replace_fill_values() helper function attempting to use a
fill value that is not representable by the current dtype."""

face_nodes = np.array([[1, 2, -1], [-1, -1, -1]], dtype=np.uint32)
face_nodes = np.array([[1, 2, -1], [-1, -1, -1]], dtype=np.int32)
rajeeja marked this conversation as resolved.
Show resolved Hide resolved
# invalid fill value with dtype should raise a valueError
with self.assertRaises(ValueError):
# INT_FILL_VALUE (max(uint32) not representable by int16)
Expand Down
Loading