nfdata 0.3.0__tar.gz → 0.3.1__tar.gz

{nfdata-0.3.0 → nfdata-0.3.1}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: nfdata
-Version: 0.3.0
+Version: 0.3.1
 Summary: Compile and edit input data for the NanoFASE model
 License: BSD-3-Clause
+License-File: LICENSE
 Author: Sam Harrison
 Author-email: samharrison.xg@gmail.com
 Requires-Python: >=3.10,<4.0
@@ -12,13 +13,14 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Requires-Dist: Pint (>=0.24.1,<0.25.0)
 Requires-Dist: f90nml (>=1.4.4,<2.0.0)
 Requires-Dist: geopandas (>=1.0.0,<2.0.0)
 Requires-Dist: netcdf4 (>=1.7.1.post1,<2.0.0)
 Requires-Dist: numpy (>=2.0.0,<3.0.0)
 Requires-Dist: pandas (>=2.2.2,<3.0.0)
-Requires-Dist: pytest (>=8.3.5,<9.0.0)
 Requires-Dist: rasterio (>=1.3.10,<2.0.0)
 Requires-Dist: ruamel.yaml (>=0.18.6,<0.19.0)
 Requires-Dist: shapely (>=2.0.4,<3.0.0)

{nfdata-0.3.0 → nfdata-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nfdata"
-version = "0.3.0"
+version = "0.3.1"
 description = "Compile and edit input data for the NanoFASE model"
 authors = ["Sam Harrison <samharrison.xg@gmail.com>"]
 license = "BSD-3-Clause"
@@ -24,12 +24,12 @@ netcdf4 = "^1.7.1.post1"
 shapely = "^2.0.4"
 Pint = "^0.24.1"
 f90nml = "^1.4.4"
-pytest = "^8.3.5"
 whitebox = "^2.3.6"
 
 
 [tool.poetry.group.dev.dependencies]
 flake8 = "^7.2.0"
+pytest = "^8.3.5"
 
 [build-system]
 requires = ["poetry-core"]

{nfdata-0.3.0 → nfdata-0.3.1}/src/nfdata/compiler.py

@@ -229,6 +229,7 @@ class Compiler:
                                                    self.config['root_dir'])
             ).resolve()
             # If we have been asked to condition the DEM, do this first
+            temp_dir = None
             if 'condition_dem' in self.config:
                 dem_path_conditioned, temp_dir = routing.condition_dem(
                     dem_path,
@@ -658,11 +659,11 @@ class Compiler:
                     else:
                         nf_cat_name = nf_cat
                         frac_contr_to_nf_cat = 1
-                    
+
                     # Add this CLC cat, multiplied by the fraction of it contributing to
                     # the NF cat, to the list of CLC rasters to be combined into this NF cat
                     nf_cat_arrs[nf_cat_name].append(src_cat_rs * frac_contr_to_nf_cat)
-                        
+
             # Sum all the contributors to each NF cat
             nf_final_arrs = {name: np.sum(nf_cat_arr, axis=0) for name, nf_cat_arr in nf_cat_arrs.items()}
 
@@ -673,7 +674,7 @@ class Compiler:
             for name, old_arr in nf_final_arrs.items():
                 if old_arr.shape == src_arr.shape:
                     # Re-read flowdir as reproject fills new_arr
-                    new_arr = self.flow_dir.copy()
+                    new_arr = np.empty(self.grid.shape, dtype=src_arr.dtype)
                     # Reproject. Remember we're not converting CRS here, so clc_rs
                     # CRS can be used as src and dst
                     reproject(
@@ -681,7 +682,7 @@ class Compiler:
                         destination=new_arr,
                         src_transform=rs.transform,
                         dst_transform=self.grid.transform,
-                        src_crs=rs.crs,    
+                        src_crs=rs.crs,
                         dst_crs=rs.crs,
                         resampling=Resampling.average
                     )