Remove numpy.NAN alias, fix mambaforge deprecation in actions

Author: wcarthur

.github/workflows/hazimp-tests.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
     defaults:
       run:
         shell: bash -l {0}
@@ -34,7 +34,8 @@ jobs:
     - name: Set up environment
       uses: conda-incubator/setup-miniconda@v2
       with:
-        miniforge-variant: Mambaforge
+        miniforge-version: latest
+        auto-update-conda: false
         channels: conda-forge,defaults
         channel-priority: true
         python-version: ${{ matrix.python-version }}

hazimp/jobs/jobs.py

@@ -675,7 +675,7 @@ def __call__(self, context, attribute_label, file_list,
         file_data, extent = raster_module.files_raster_data_at_points(
             context.exposure_long,
             context.exposure_lat, file_list)
-        file_data[file_data == no_data_value] = np.NAN
+        file_data[file_data == no_data_value] = np.nan
 
         context.exposure_att[attribute_label] = file_data
 

hazimp/raster.py

@@ -110,7 +110,7 @@ def raster_data_at_points(self, lon, lat):
         assert lon.size == lat.size
 
         values = numpy.empty(lon.size)
-        values[:] = numpy.NAN
+        values[:] = numpy.nan
 
         # get an index of all the values inside the grid
         # there has to be a better way...
@@ -147,7 +147,7 @@ def read_cell(i, x, y):
                                     row_offset[index].item())
 
         # Change NODATA_value to NAN
-        values = numpy.where(values == self.no_data_value, numpy.NAN,
+        values = numpy.where(values == self.no_data_value, numpy.nan,
                              values)
 
         return values

tests/jobs/test_jobs.py

@@ -450,7 +450,7 @@ def test_load_raster_clipping(self, mock_used):
         f.write('7.9, 1.5, 2, -9999\n')  # Out of Haz area
         f.write('8.9, 2.9, 3, 6\n')
         f.write('8.9, 3.1, 4, -9999.\n')  # Out of Haz area
-        f.write('9.9, 2.9, 5, NaN\n')  # In no data area
+        f.write('9.9, 2.9, 5, nan\n')  # In no data area
         f.close()
 
         inst = JOBS[LOADCSVEXPOSURE]
@@ -482,7 +482,7 @@ def test_load_raster_clipping(self, mock_used):
         inst(con_in, **test_kwargs)
         the_nans = isnan(con_in.exposure_att[haz_v])
 
-        con_in.exposure_att.loc[the_nans, (haz_v,)] = numpy.NAN
+        con_in.exposure_att.loc[the_nans, (haz_v,)] = numpy.nan
         msg = ("con_in.exposure_att[haz_v] \n" +
                str(con_in.exposure_att[haz_v].values))
         msg += "\n not = con_in.exposure_att['haz_actual'] \n" + \

tests/jobs/test_vulnerability_model.py

@@ -206,14 +206,14 @@ def test_realised_vulnerability_curves2(self):
                                            vulnerability_set_id,
                                            default_loss)
 
-        intensities = asarray([[0.5, numpy.NAN], [0.1, numpy.NAN]])
+        intensities = asarray([[0.5, numpy.nan], [0.1, numpy.nan]])
         loss = rvc1.look_up(intensities)
         actual = asarray([[0.5, 10], [0.01, 10]])
         msg = 'got: ' + str(loss) + '\n actual: ' + str(actual)
         self.assertTrue(allclose(loss,
                                  actual), msg)
 
-        intensities = asarray([0.5, numpy.NAN])
+        intensities = asarray([0.5, numpy.nan])
         loss = rvc1.look_up(intensities)
         self.assertTrue(allclose(loss,
                                  asarray([0.5, 10.0])), 'got ' + str(loss))