py-ewr 2.2.7__tar.gz → 2.3.0__tar.gz

{py_ewr-2.2.7 → py_ewr-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py_ewr
-Version: 2.2.7
+Version: 2.3.0
 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.3.0 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 → py_ewr-2.3.0}/README.md

@@ -3,7 +3,7 @@
 [![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.3.0 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 → py_ewr-2.3.0}/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 → py_ewr-2.3.0}/py_ewr/model_metadata/SiteID_MDBA.csv

@@ -2692,4 +2692,9 @@ Bills Pipe,Bills Pipe,North Redbank,Bills Pipe,2
 Glen Dee,Glen Dee,"Western Lakes, Glenn Dee",Glen Dee,2
 Pattos Pipe,Pattos Pipe,North Redbank,Pattos Pipe,2
 Pump direct from river,Pump direct from river,"North Redbank, pumped direct from river",Pump direct from river,2
-Pumped from Yanga Lake,Pumped from Yanga Lake,Yanga (South  Redbank),Pumped from Yanga Lake,2
+Pumped from Yanga Lake,Pumped from Yanga Lake,Yanga (South  Redbank),Pumped from Yanga Lake,2
+410738,Murrumbidgee River at Mt. MacDonald,"ACT - Environment, Planning and Sustainable Development Directorate",410738,3
+410761,Murrumbidgee River below Lobbs Hole Creek,"ACT - Environment, Planning and Sustainable Development Directorate",410761,3
+410700,Cotter River at Kiosk,ACT - Icon Water Limited,410700,3
+410747,Cotter River below Bendora Dam,ACT - Icon Water Limited,410747,3
+410752,Cotter River below Corin Dam,ACT - Icon Water Limited,410752,3