py-ewr 2.2.7__py3-none-any.whl → 2.2.9__py3-none-any.whl

py_ewr/evaluate_EWRs.py

@@ -448,8 +448,9 @@ def get_index_date(date_index:Any)-> datetime.date:
     if type(date_index) == pd._libs.tslibs.period.Period:
         date_index_str = date_index.strftime('%Y-%m-%d')
         # For dates between the years 100 and 999 we need to add a 0 onto the date string so strptime doesnt break
-        if ((int(date_index_str.split('-')[0]) >= 100) and (int(date_index_str.split('-')[0]) < 1000)):
-            date_index_str = '0' + date_index_str
+        if len(date_index_str.split('-')[0]) < 4:
+            if ((int(date_index_str.split('-')[0]) >= 100) and (int(date_index_str.split('-')[0]) < 1000)):
+                date_index_str = '0' + date_index_str
         n = datetime.datetime.strptime(date_index_str, '%Y-%m-%d').date()
         return n
     if type(date_index) == str:
@@ -5171,4 +5172,4 @@ def calc_sorter(df_F:pd.DataFrame, df_L:pd.DataFrame, gauge:str, EWR_table:pd.Da
         location_results[PU_name] = PU_df
         location_events[PU_name] = PU_events
 
-    return location_results, location_events
+    return location_results, location_events

{py_ewr-2.2.7.dist-info → py_ewr-2.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py_ewr
-Version: 2.2.7
+Version: 2.2.9
 Summary: Environmental Water Requirement calculator
 Home-page: https://github.com/MDBAuth/EWR_tool
 Author: Martin Job
@@ -34,7 +34,7 @@ Requires-Dist: numpy <2
 [![PyPI](https://img.shields.io/pypi/v/py-ewr)](https://pypi.org/project/py-ewr/)
 [![DOI](https://zenodo.org/badge/342122359.svg)](https://zenodo.org/badge/latestdoi/342122359)
 
-### **EWR tool version 2.2.7 README**
+### **EWR tool version 2.2.9 README**
 
 ### **Notes on recent version updates**
 - Including draft objective mapping files in the package (see below sub heading **Objective mapping** for more information). Objective mapping has been therefore pulled out of the parameter sheet

{py_ewr-2.2.7.dist-info → py_ewr-2.2.9.dist-info}/RECORD

@@ -1,6 +1,6 @@
 py_ewr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_ewr/data_inputs.py,sha256=OLIxqq15yoEqLSRmBJP37erldUGRRvSNn2XwO8LKZA8,20080
-py_ewr/evaluate_EWRs.py,sha256=ahdcc6N37wc-e6-S6JSx6VFm9eNkef0JBPXz16-SAaU,231267
+py_ewr/evaluate_EWRs.py,sha256=bAhFZTQZkoAE2eKgNIomm1LJdZ2HihoygUnXybtEdm4,231326
 py_ewr/io.py,sha256=Is0xPAzLx6-ylpTFyYJxMimkNVxxoTxUcknTk6bQbgs,840
 py_ewr/observed_handling.py,sha256=aVQYI8Qs-v5DZOA_r8bYluE3ilgM7Vjygs29jA6kpaA,17848
 py_ewr/scenario_handling.py,sha256=95HdNNPkY-w77hxnHRJxfzmn9fBu6OqHM5iyoQPwOXE,35498
@@ -13,8 +13,8 @@ py_ewr/parameter_metadata/ewr_calc_config.json,sha256=l1AgIRlf7UUmk3BNQ4r3kutU48
 py_ewr/parameter_metadata/obj2target.csv,sha256=DIcwrOyvNPhBdvplWb8GU-2Hu33NwYhrXenAbnRD-dM,1773425
 py_ewr/parameter_metadata/obj2yrtarget.csv,sha256=x-lvGTHMsXutSKfgN6_B0ujQueiu953lEk-_k8ybTNw,56681
 py_ewr/parameter_metadata/parameter_sheet.csv,sha256=Pm741CUDywFJ_Jd8LN41YcimKvne-ey-gJskI13wTIk,772287
-py_ewr-2.2.7.dist-info/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
-py_ewr-2.2.7.dist-info/METADATA,sha256=yNiDURx97CzSTLq5BIHTYYv-Z4-j-RwdDSX_IJe9460,12521
-py_ewr-2.2.7.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-py_ewr-2.2.7.dist-info/top_level.txt,sha256=n3725d-64Cjyb-YMUMV64UAuIflzUh2_UZSxiIbrur4,7
-py_ewr-2.2.7.dist-info/RECORD,,
+py_ewr-2.2.9.dist-info/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
+py_ewr-2.2.9.dist-info/METADATA,sha256=tCty8mRuqb3xrgURdtZXlOpyaeu5CkL_-2I34lPlCSA,12521
+py_ewr-2.2.9.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+py_ewr-2.2.9.dist-info/top_level.txt,sha256=n3725d-64Cjyb-YMUMV64UAuIflzUh2_UZSxiIbrur4,7
+py_ewr-2.2.9.dist-info/RECORD,,