diff --git a/pyfair/model/model.py b/pyfair/model/model.py index a029059..6493ac5 100644 --- a/pyfair/model/model.py +++ b/pyfair/model/model.py @@ -460,9 +460,9 @@ def calculate_all(self): # If required data has not been input, raise error ready_for_calculation = self._tree.ready_for_calculation() if not(ready_for_calculation): - status_str = str(pd.Series(self._tree.get_node_statuses())) + status_str = str(pd.Series(self._tree.get_node_statuses(), dtype='str')) raise FairException('Not ready for calculation. See statuses: \n{}'.format(status_str)) - status = pd.Series(self._tree.get_node_statuses()) + status = pd.Series(self._tree.get_node_statuses(), dtype='str') # Needs to be string to avoid weird numpy error with empty status array # https://stackoverflow.com/questions/40659212/futurewarning-elementwise-comparison-failed-returning-scalar-but-in-the-futur calculable_nodes = (status.loc[status.astype(str) == 'Calculable'] diff --git a/pyfair/report/base_report.py b/pyfair/report/base_report.py index a5d556d..d89e746 100644 --- a/pyfair/report/base_report.py +++ b/pyfair/report/base_report.py @@ -204,7 +204,7 @@ def _get_metadata_table(self): 'Created': str(datetime.datetime.now()).partition('.')[0], 'PyFair Version': VERSION, 'Type': type(self).__name__ - }).to_frame().to_html(border=0, header=None, justify='left', classes='fair_metadata_table') + }).to_frame().to_html(border=0, header=False, justify='left', classes='fair_metadata_table') return metadata def _get_tree(self, model):