upgrading to GEOS5FP>=1.1.1

Author: gregory-halverson

FLiESANN/generate_FLiES_inputs_table.py

@@ -3,7 +3,7 @@
 import numpy as np
 import pandas as pd
 
-from geos5fp import GEOS5FP
+from GEOS5FP import GEOS5FP
 from sentinel_tiles import sentinel_tiles
 from sun_angles import calculate_SZA_from_datetime
 from koppengeiger import load_koppen_geiger

FLiESANN/process_FLiES_ANN.py

@@ -4,7 +4,7 @@
 import numpy as np
 import rasters as rt
 from rasters import Raster, RasterGeometry
-from geos5fp import GEOS5FP
+from GEOS5FP import GEOS5FP
 from solar_apparent_time import solar_day_of_year_for_area, solar_hour_of_day_for_area
 from sun_angles import calculate_SZA_from_DOY_and_hour
 from koppengeiger import load_koppen_geiger

FLiESANN/version.txt

@@ -1 +1 @@
-1.4.0
+1.4.1

Processing FLiES with a raster and default parameters.ipynb

@@ -19,7 +19,7 @@
     "from datetime import datetime, date, time\n",
     "from dateutil import parser\n",
     "import rasters as rt\n",
-    "from geos5fp import GEOS5FP\n",
+    "from GEOS5FP import GEOS5FP\n",
     "from koppengeiger import load_koppen_geiger\n",
     "from solar_apparent_time import UTC_to_solar\n",
     "import sun_angles\n",

makefile

@@ -24,9 +24,6 @@ dist:
 	make build
 	make twine-upload
 
-remove-environment:
-	mamba env remove -y -n rasters
-
 install:
 	pip install -e .[dev]
 

processing_FLiES_with_raster_and_default_parameters.py

@@ -8,7 +8,7 @@
 from datetime import datetime, date, time
 from dateutil import parser
 import rasters as rt
-from geos5fp import GEOS5FP
+from GEOS5FP import GEOS5FP
 from koppengeiger import load_koppen_geiger
 from solar_apparent_time import UTC_to_solar
 import sun_angles

pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=60", "setuptools-scm>=8.0", "wheel"]
 
 [project]
 name = "FLiESANN"
-version = "1.4.0"
+version = "1.4.1"
 description = "Forest Light Environmental Simulator (FLiES) Radiative Transfer Model Artificial Neural Network (ANN) Implementation in Python"
 readme = "README.md"
 authors = [
@@ -14,7 +14,7 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "geos5fp",
+    "GEOS5FP>=1.1.1",
     "keras==2.15",
     "koppengeiger",
     "MCD12C1-2019-v006",

tests/test_import_dependencies.py

@@ -2,7 +2,7 @@
 
 # List of dependencies
 dependencies = [
-    "geos5fp",
+    "GEOS5FP",
     "keras",
     "koppengeiger",
     "MCD12C1_2019_v006",