From 653befac73f17000935dbdd4efc43f5e4f6f212a Mon Sep 17 00:00:00 2001 From: Brian Ryall Date: Sun, 17 Sep 2023 13:11:20 -0400 Subject: [PATCH] fix: pandas v2 upgrade --- src/fava_envelope/__init__.py | 2 -- src/fava_envelope/modules/beancount_envelope.py | 15 ++++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/fava_envelope/__init__.py b/src/fava_envelope/__init__.py index 5ad8ba5..47e6a3f 100644 --- a/src/fava_envelope/__init__.py +++ b/src/fava_envelope/__init__.py @@ -43,7 +43,6 @@ def get_currencies(self): return None def generate_income_query_tables(self, month): - income_table_types = [] income_table_types.append(("Name", str(str))) income_table_types.append(("Amount", str(Decimal))) @@ -85,7 +84,6 @@ def generate_income_query_tables(self, month): return income_table_types, income_table_rows def generate_envelope_query_tables(self, month): - envelope_table_types = [] envelope_table_types.append(("Account", str(str))) envelope_table_types.append(("Budgeted", str(Decimal))) diff --git a/src/fava_envelope/modules/beancount_envelope.py b/src/fava_envelope/modules/beancount_envelope.py index 9798232..ded0d3f 100644 --- a/src/fava_envelope/modules/beancount_envelope.py +++ b/src/fava_envelope/modules/beancount_envelope.py @@ -22,7 +22,6 @@ class BeancountEnvelope: def __init__(self, entries, options_map, currency): - self.entries = entries self.options_map = options_map self.currency = currency @@ -115,7 +114,6 @@ def _find_envelop_settings(self): ) def envelope_tables(self): - months = [] date_current = self.date_start while date_current < self.date_end: @@ -163,19 +161,21 @@ def envelope_tables(self): for index, row in self.envelope_df.iterrows(): for index2, month in enumerate(months): if index2 == 0: - row[month, "available"] = ( + self.envelope_df[month, "available"][index] = ( row[month, "budgeted"] + row[month, "activity"] ) else: - prev_available = row[months[index2 - 1], "available"] + prev_available = self.envelope_df[ + months[index2 - 1], "available" + ][index] if prev_available > 0 or self.negative_rollover: - row[month, "available"] = ( + self.envelope_df[month, "available"][index] = ( prev_available + row[month, "budgeted"] + row[month, "activity"] ) else: - row[month, "available"] = ( + self.envelope_df[month, "available"][index] = ( row[month, "budgeted"] + row[month, "activity"] ) @@ -239,7 +239,6 @@ def envelope_tables(self): return self.income_df, self.envelope_df, self.currency def _calculate_budget_activity(self): - # Accumulate expenses for the period balances = collections.defaultdict( lambda: collections.defaultdict(inventory.Inventory) @@ -247,7 +246,6 @@ def _calculate_budget_activity(self): all_months = set() for entry in data.filter_txns(self.entries): - # Check entry in date range if entry.date < self.date_start or entry.date > self.date_end: continue @@ -270,7 +268,6 @@ def _calculate_budget_activity(self): continue for posting in entry.postings: - account = posting.account for regexp, target_account in self.mappings: if regexp.match(account):