Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: check-merge-conflict
Expand All @@ -10,7 +10,7 @@ repos:
- id: detect-private-key

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.2.1
rev: v0.11.10
hooks:
- id: ruff
- id: ruff-format
6 changes: 3 additions & 3 deletions process_report/invoices/pi_specific_invoice.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ def _get_pi_dataframe(self, data, pi):
if column_name in pi_projects.columns:
column_sums.append(pi_projects[column_name].sum())
sum_columns_list.append(column_name)
pi_projects.loc[
len(pi_projects)
] = None # Adds a new row to end of dataframe initialized with None
pi_projects.loc[len(pi_projects)] = (
None # Adds a new row to end of dataframe initialized with None
)
pi_projects.loc[pi_projects.index[-1], invoice.INVOICE_DATE_FIELD] = "Total"
pi_projects.loc[pi_projects.index[-1], sum_columns_list] = column_sums

Expand Down
6 changes: 3 additions & 3 deletions process_report/processors/add_institution_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ def _add_institution(self):
if pandas.isna(pi_name):
logger.info(f"Project {row[invoice.PROJECT_FIELD]} has no PI")
else:
self.data.at[
i, invoice.INSTITUTION_FIELD
] = util.get_institution_from_pi(institute_map, pi_name)
self.data.at[i, invoice.INSTITUTION_FIELD] = (
util.get_institution_from_pi(institute_map, pi_name)
)

def _process(self):
self._add_institution()
6 changes: 3 additions & 3 deletions process_report/processors/prepayment_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ def _get_prepay_group_dict(self):
for _, group_info in self.prepay_contacts.iterrows():
group_name = group_info[invoice.PREPAY_GROUP_NAME_FIELD]
prepay_group_dict[group_name] = dict()
prepay_group_dict[group_name][
invoice.PREPAY_GROUP_CONTACT_FIELD
] = group_info[invoice.PREPAY_GROUP_CONTACT_FIELD]
prepay_group_dict[group_name][invoice.PREPAY_GROUP_CONTACT_FIELD] = (
group_info[invoice.PREPAY_GROUP_CONTACT_FIELD]
)
prepay_group_dict[group_name][invoice.PREPAY_MANAGED_FIELD] = (
group_info[invoice.PREPAY_MANAGED_FIELD].lower() == "yes"
)
Expand Down
Loading