imsciences 0.6.0.4__tar.gz → 0.6.0.5__tar.gz

{imsciences-0.6.0.4 → imsciences-0.6.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imsciences
-Version: 0.6.0.4
+Version: 0.6.0.5
 Summary: IMS Data Processing Package
 Author: IMS
 Author-email: cam@im-sciences.com

{imsciences-0.6.0.4 → imsciences-0.6.0.5}/imsciences/datafunctions.py

@@ -898,7 +898,7 @@ class dataprocessing:
         start_year = int(starting_FY[2:])
 
         def calculate_FY_vectorized(date_series):
-            years_since_start = ((date_series - start_date).dt.days / 365.25).astype(int)
+            years_since_start = ((date_series - start_date).dt.days / 364).astype(int)
             fy = 'FY' + (start_year + years_since_start).astype(str)
             if short_format == "Yes":
                 fy = 'FY' + fy.str[-2:]
@@ -907,8 +907,14 @@ class dataprocessing:
         df['FY'] = calculate_FY_vectorized(df[index_col])
 
         if half_years == "Yes" or combined_FY_and_H == "Yes":
-            end_of_h1 = start_date + pd.DateOffset(months=6) - pd.DateOffset(days=1)
-            df['Half Years'] = np.where(df[index_col] <= end_of_h1, 'H1', 'H2')
+            def calculate_half_year_vectorized(date_series):
+                fy_years_since_start = ((date_series - start_date).dt.days / 364).astype(int)
+                fy_start_dates = start_date + fy_years_since_start * pd.DateOffset(years=1)
+                fy_end_of_h1 = fy_start_dates + pd.DateOffset(weeks=26) - pd.DateOffset(weeks=1)
+                half_year = np.where(date_series <= fy_end_of_h1, 'H1', 'H2')
+                return half_year
+            
+            df['Half Years'] = calculate_half_year_vectorized(df[index_col])
         
         if combined_FY_and_H == "Yes":
             df['Financial Half Years'] = df['FY'] + ' ' + df['Half Years']

{imsciences-0.6.0.4 → imsciences-0.6.0.5}/imsciences.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imsciences
-Version: 0.6.0.4
+Version: 0.6.0.5
 Summary: IMS Data Processing Package
 Author: IMS
 Author-email: cam@im-sciences.com

{imsciences-0.6.0.4 → imsciences-0.6.0.5}/setup.py

@@ -8,7 +8,7 @@ def read_md(file_name):
             return f.read()
     return ''
 
-VERSION = '0.6.0.4'
+VERSION = '0.6.0.5'
 DESCRIPTION = 'IMS Data Processing Package'
 LONG_DESCRIPTION = read_md('README.md')  # Reading from README.md