geocif 0.1.91__tar.gz → 0.1.93__tar.gz

{geocif-0.1.91/geocif.egg-info → geocif-0.1.93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geocif
-Version: 0.1.91
+Version: 0.1.93
 Summary: Models to visualize and forecast crop conditions and yields
 Home-page: https://ritviksahajpal.github.io/yield_forecasting/
 Author: Ritvik Sahajpal

{geocif-0.1.91 → geocif-0.1.93}/geocif/cei/indices.py

@@ -250,11 +250,8 @@ def compute_indices(
         df_time_period = adjust_dataframes(df_time_period)
         df_base_period = adjust_dataframes(df_base_period)
 
-    try:
-        dx, vals_ix = df_to_xarray(df_base_period)
-        start_br, end_br, start_tr, end_tr = get_icclim_dates(vals_ix, df_time_period.set_index(["lat", "lon", "time"]))
-    except:
-        breakpoint()
+    dx, vals_ix = df_to_xarray(df_base_period)
+    start_br, end_br, start_tr, end_tr = get_icclim_dates(vals_ix, df_time_period.set_index(["lat", "lon", "time"]))
 
     # For seasonal indices, slice_mode is used, but for SPI indices it fails
     slice_mode = (
@@ -535,8 +532,6 @@ class CEIs:
                     frames_region_and_stage.append(df_result)
             except Exception as e:
                 logger.error("Error in process_group for %s: %s", key, e)
-                print(df_group)
-                breakpoint()
 
         if frames_region_and_stage:
             return pd.concat(frames_region_and_stage, ignore_index=True)
@@ -662,6 +657,7 @@ class CEIs:
                             index_type,
                             index_details
                         )
+
                         if not df_processed.empty:
                             frames_group.append(df_processed)
             except Exception as e:
@@ -827,7 +823,7 @@ class CEIs:
                 "Crop": self.crop.replace("_", " ").title(),
                 "Season": self.season,
                 "Method": self.method,
-                "Stage": "_".join(map(str, stage)) if stage else None,
+                "Stage": "_".join(map(str, stage)) if len(stage) else None,
                 "Harvest Year": self.harvest_year,
                 "Index": iname,
                 "Type": itype

{geocif-0.1.91 → geocif-0.1.93}/geocif/indices_runner.py

@@ -165,7 +165,7 @@ class cei_runner(base.BaseGeo):
         combinations = [
             i
             for i in combinations
-            # if "ukraine" in i[3]
+            if "ukraine" in i[3]
             # or "lesotho_maize" in i[3] or
             # #   "namibia_" in i[2] or
             # "united_republic_of_tanzania_maize" in i[3]
@@ -174,7 +174,7 @@ class cei_runner(base.BaseGeo):
             # or "south_africa_maize" in i[3]
             # or "mozambique_maize" in i[3]
             # or "united_states_of_america" in i[3]
-            if "russian_federation_winter_wheat" in i[3]
+            or "russian_federation" in i[3]
             # or "ukraine" in i[3]
         ]
         #                 "malawi" in i[2]]

{geocif-0.1.91 → geocif-0.1.93/geocif.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: geocif
-Version: 0.1.91
+Version: 0.1.93
 Summary: Models to visualize and forecast crop conditions and yields
 Home-page: https://ritviksahajpal.github.io/yield_forecasting/
 Author: Ritvik Sahajpal

{geocif-0.1.91 → geocif-0.1.93}/setup.py

@@ -50,6 +50,6 @@ setup(
     test_suite="tests",
     tests_require=test_requirements,
     url="https://ritviksahajpal.github.io/yield_forecasting/",
-    version="0.1.91",
+    version="0.1.93",
     zip_safe=False,
 )