Merge pull request #47 from TUW-GEO/fix-numpy2

Fix np.inf for numpy 2.0

.github/workflows/ubuntu.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
         os: ["ubuntu-latest"]
 
     steps:
@@ -54,7 +54,7 @@ jobs:
       - name: Install package and test
         shell: bash -l {0}
         run: |
-          pip install -e .
+          pip install -e .[testing]
           pytest --cache-clear
       - name: Upload Coverage
         shell: bash -l {0}

.github/workflows/windows.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
         os: ['windows-latest']
 
     steps:
@@ -43,5 +43,5 @@ jobs:
       - name: Install package and test
         shell: bash -l {0}
         run: |
-          pip install -e .
+          pip install -e .[testing]
           pytest --cache-clear

environment.yml

@@ -1,11 +1,13 @@
 name: pygeobase_env
+channels:
+  - conda-forge
 dependencies:
 - hdf5
 - numpy
 - netCDF4
 - pykdtree
 - pip
 - pip:
-  - pygeogrids
+  - pygeogrids>=0.5.1
   - pytest
   - pytest-cov

setup.cfg

@@ -43,7 +43,7 @@ python_requires = >=3.6
 install_requires =
     importlib-metadata; python_version<"3.8"
     numpy
-    pygeogrids
+    pygeogrids>=0.5.1
 
 
 [options.packages.find]
@@ -58,7 +58,6 @@ exclude =
 
 # Add here test requirements (semicolon/line-separated)
 testing =
-    setuptools
     pytest
     pytest-cov
 

src/pygeobase/io_base.py

@@ -428,7 +428,7 @@ def _read_lonlat(self, lon, lat, **kwargs):
         data : dict of values
             data record.
         """
-        max_dist = kwargs.pop("max_dist", np.Inf)
+        max_dist = kwargs.pop("max_dist", np.inf)
         gp, _ = self.grid.find_nearest_gpi(lon, lat, max_dist)
 
         return self._read_gp(gp, **kwargs)

tests/test_io_base.py

@@ -97,6 +97,7 @@ def test_gridded_ts_base_read_append():
     ds = GriddedTsBase("", grid, Dataset, mode='a')
     # during iteration the gpis are traversed based on cells for a cell grid
     assert ds.read(1) == 1
+    assert ds.read(1, 1) == 1
 
 
 def test_gridded_ts_base_iter_gp_IOError_None_yield():