py-ewr 2.2.6__tar.gz → 2.2.9__tar.gz

{py_ewr-2.2.6 → py_ewr-2.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py_ewr
-Version: 2.2.6
+Version: 2.2.9
 Summary: Environmental Water Requirement calculator
 Home-page: https://github.com/MDBAuth/EWR_tool
 Author: Martin Job
@@ -27,14 +27,14 @@ Requires-Dist: cachetools>5
 Requires-Dist: xarray
 Requires-Dist: h5py
 Requires-Dist: netCDF4
-Requires-Dist: numpy
+Requires-Dist: numpy<2
 
 [![CI](https://github.com/MDBAuth/EWR_tool/actions/workflows/test-release.yml/badge.svg)]()
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/py-ewr)](https://pypi.org/project/py-ewr/)
 [![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.6 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.6 → py_ewr-2.2.9}/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.6 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
@@ -226,4 +226,4 @@ Consult the user manual for instructions on how to run the tool. Please email th
 Objective mapping csv files are now included in the EWR tool package. Currently this objective mapping is in an early draft format. The objective mapping will be finalised after consultation with relevant state representatives. The files are intended to be used together to link EWRs to the detailed objectives, theme level targets and specific goals. The three sheets are located in the py_ewr/parameter_metadata folder:
 - ewr2obj.csv: For each planning unit, gauge, ewr combination there are either one or many env_obj codes. These env_obj codes come under one of five different theme level targets (Native Fish, Native vegetation, Waterbirds, Other species or Ecosystem functions)
 - obj2target.csv: env_obj's are unique to their planning unit in the LTWP (noting there are often a lot of similarities between env_obj's in the same states). The plain english wording of the env objectives is also contained in this csv. The LTWP, planning unit and env_obj rows are repeated for each specific goal related to that LTWP, planning unit and env_obj. 
-- obj2yrtarget.csv: The environmental objectives are related to 5, 10 and 20 year targets
+- obj2yrtarget.csv: The environmental objectives are related to 5, 10 and 20 year targets

{py_ewr-2.2.6 → py_ewr-2.2.9}/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.6 → py_ewr-2.2.9}/py_ewr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py_ewr
-Version: 2.2.6
+Version: 2.2.9
 Summary: Environmental Water Requirement calculator
 Home-page: https://github.com/MDBAuth/EWR_tool
 Author: Martin Job
@@ -27,14 +27,14 @@ Requires-Dist: cachetools>5
 Requires-Dist: xarray
 Requires-Dist: h5py
 Requires-Dist: netCDF4
-Requires-Dist: numpy
+Requires-Dist: numpy<2
 
 [![CI](https://github.com/MDBAuth/EWR_tool/actions/workflows/test-release.yml/badge.svg)]()
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/py-ewr)](https://pypi.org/project/py-ewr/)
 [![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.6 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.6 → py_ewr-2.2.9}/py_ewr.egg-info/requires.txt

@@ -5,4 +5,4 @@ cachetools>5
 xarray
 h5py
 netCDF4
-numpy
+numpy<2

{py_ewr-2.2.6 → py_ewr-2.2.9}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="py_ewr",
-    version="2.2.6",
+    version="2.2.9",
     author="Martin Job",
     author_email="Martin.Job@mdba.gov.au",
     description="Environmental Water Requirement calculator",
@@ -39,7 +39,7 @@ setup(
         "xarray",#==2023.09.0",
         "h5py",#==3.12.1",
         "netCDF4",#==1.6.4",
-        "numpy"#<2"
+        "numpy<2"
     ],
     package_data={'': ["model_metadata/*.csv", "parameter_metadata/*.csv","parameter_metadata/*.json"]},
 )