diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bce128db7..f4b9cba5f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/README.md b/README.md index 743a96f5e..c29233059 100644 --- a/README.md +++ b/README.md @@ -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/) diff --git a/ci/asv.yml b/ci/asv.yml index 5fd70ebe2..f807b3df6 100644 --- a/ci/asv.yml +++ b/ci/asv.yml @@ -13,7 +13,7 @@ dependencies: - netcdf4 - numba - numpy - - pandas<2.1.0 + - pandas - pathlib - pre_commit - pyarrow @@ -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 ../ diff --git a/ci/docs.yml b/ci/docs.yml index 01df0ce5a..c6d7ec9cf 100644 --- a/ci/docs.yml +++ b/ci/docs.yml @@ -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 diff --git a/ci/environment.yml b/ci/environment.yml index 88350b007..6ef0b278c 100644 --- a/ci/environment.yml +++ b/ci/environment.yml @@ -15,8 +15,8 @@ dependencies: - matplotlib-inline - netcdf4 - numba - - numpy<2 - - pandas<2.1.0 + - numpy + - pandas - pathlib - pre_commit - pyarrow @@ -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 diff --git a/pyproject.toml b/pyproject.toml index 193b915c1..9c04be544 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,6 +7,7 @@ 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', @@ -14,7 +15,7 @@ classifiers=[ ] 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" @@ -33,8 +34,8 @@ dependencies = [ "matplotlib-inline", "netcdf4", "numba", - "numpy<2.0.0", - "pandas<2.1.0", + "numpy", + "pandas", "pyarrow", "requests", "scikit-learn", @@ -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/" @@ -63,8 +64,8 @@ requires = [ "setuptools-scm>=8", ] -[tool.setuptools.packages] -find = {} +[tool.setuptools] +packages = ["uxarray"] [tool.setuptools_scm] fallback_version = "9999" diff --git a/test/test_helpers.py b/test/test_helpers.py index 202c51bfe..c5b923a26 100644 --- a/test/test_helpers.py +++ b/test/test_helpers.py @@ -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) # invalid fill value with dtype should raise a valueError with self.assertRaises(ValueError): # INT_FILL_VALUE (max(uint32) not representable by int16)