diff --git a/dev-requirements.txt b/dev-requirements.txt index b4c6d6865..7e949b5b8 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,4 +1,4 @@ -black == 21.12b0 +black == 24.4.2 pre-commit == 2.0.1 PyYAML >= 5.4 pylint >= 2.3.0 diff --git a/pyproject.toml b/pyproject.toml index 69417f8f1..f1a432ef3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -71,4 +71,4 @@ ignore_errors = true [tool.black] line-length = 120 -exclude = '\.git|ui|resources_icons_rc.py|resources_logos_rc.py' +exclude = '\.git|ui|resources_icons_rc.py|resources_logos_rc.py|version.py' diff --git a/spinetoolbox/helpers.py b/spinetoolbox/helpers.py index 3666c53b4..667f2b560 100644 --- a/spinetoolbox/helpers.py +++ b/spinetoolbox/helpers.py @@ -1047,7 +1047,7 @@ def unique_name(prefix, existing): prefix = match[1] reserved.add(int(match[2])) - pattern = re.compile(fr"^{prefix} \(([0-9]+)\)$") + pattern = re.compile(rf"^{prefix} \(([0-9]+)\)$") for name in existing: match = pattern.fullmatch(name) if match: diff --git a/spinetoolbox/plotting.py b/spinetoolbox/plotting.py index 83562b8dc..e40dc98d7 100644 --- a/spinetoolbox/plotting.py +++ b/spinetoolbox/plotting.py @@ -261,9 +261,9 @@ def plot_data(data_list, plot_widget=None, plot_type=None): """ if plot_widget is None: plot_widget = PlotWidget( - legend_axes_position=LegendPosition.BOTTOM - if len(data_list) < LEGEND_PLACEMENT_THRESHOLD - else LegendPosition.RIGHT + legend_axes_position=( + LegendPosition.BOTTOM if len(data_list) < LEGEND_PLACEMENT_THRESHOLD else LegendPosition.RIGHT + ) ) needs_redraw = False else: diff --git a/spinetoolbox/spine_db_editor/mvcmodels/entity_tree_item.py b/spinetoolbox/spine_db_editor/mvcmodels/entity_tree_item.py index ee9b633cb..5a4904d5a 100644 --- a/spinetoolbox/spine_db_editor/mvcmodels/entity_tree_item.py +++ b/spinetoolbox/spine_db_editor/mvcmodels/entity_tree_item.py @@ -226,9 +226,11 @@ def display_data(self): element_byname_list = self.element_byname_list if element_byname_list: element_byname_list = [ - x - if not isinstance(self.parent_item, EntityItem) or x != self.parent_item.byname - else ["\u066D"] * len(x) + ( + x + if not isinstance(self.parent_item, EntityItem) or x != self.parent_item.byname + else ["\u066D"] * len(x) + ) for x in element_byname_list ] return DB_ITEM_SEPARATOR.join([DB_ITEM_SEPARATOR.join(x) for x in element_byname_list]) diff --git a/spinetoolbox/spine_db_editor/mvcmodels/metadata_table_model_base.py b/spinetoolbox/spine_db_editor/mvcmodels/metadata_table_model_base.py index 9ed04cc88..241d3179c 100644 --- a/spinetoolbox/spine_db_editor/mvcmodels/metadata_table_model_base.py +++ b/spinetoolbox/spine_db_editor/mvcmodels/metadata_table_model_base.py @@ -361,9 +361,9 @@ def _add_data(self, db_map_data): for db_map, items in db_map_data.items(): unique_identifiers = {} for item in items: - unique_identifiers.setdefault(item[self._ITEM_NAME_KEY], {})[ - item[self._ITEM_VALUE_KEY] - ] = self._ids_from_added_item(item) + unique_identifiers.setdefault(item[self._ITEM_NAME_KEY], {})[item[self._ITEM_VALUE_KEY]] = ( + self._ids_from_added_item(item) + ) for i, row in enumerate(self._data): if row[Column.DB_MAP] != db_map: continue diff --git a/spinetoolbox/spine_db_editor/widgets/tabular_view_mixin.py b/spinetoolbox/spine_db_editor/widgets/tabular_view_mixin.py index 18ca9af2a..07bf5dd9d 100644 --- a/spinetoolbox/spine_db_editor/widgets/tabular_view_mixin.py +++ b/spinetoolbox/spine_db_editor/widgets/tabular_view_mixin.py @@ -417,8 +417,8 @@ def create_filter_menu(self, identifier): else: item_type = header.header_type if header.header_type == "entity": - accepts_item = ( - lambda item, db_map: self.accepts_ith_element_item(header.rank, item, db_map) + accepts_item = lambda item, db_map: ( + self.accepts_ith_element_item(header.rank, item, db_map) if self.first_current_entity_class["dimension_id_list"] else self.accepts_entity_item ) diff --git a/spinetoolbox/spine_db_manager.py b/spinetoolbox/spine_db_manager.py index 3b64d44ae..bcdf07044 100644 --- a/spinetoolbox/spine_db_manager.py +++ b/spinetoolbox/spine_db_manager.py @@ -717,7 +717,7 @@ def get_item(db_map, item_type, id_): """ mapped_table = db_map.mapped_table(item_type) item = mapped_table.find_item_by_id(id_) - if hasattr(item, 'public_item'): + if hasattr(item, "public_item"): return item.public_item else: return item diff --git a/spinetoolbox/widgets/custom_qgraphicsviews.py b/spinetoolbox/widgets/custom_qgraphicsviews.py index 7a85d30e7..1b7089b36 100644 --- a/spinetoolbox/widgets/custom_qgraphicsviews.py +++ b/spinetoolbox/widgets/custom_qgraphicsviews.py @@ -189,7 +189,7 @@ def wheelEvent(self, event): self.time_line.start() else: angle = event.angleDelta().y() - factor = self._zoom_factor_base ** angle + factor = self._zoom_factor_base**angle self.gentle_zoom(factor, event.position().toPoint()) self._set_preferred_scene_rect() @@ -273,12 +273,12 @@ def _handle_resize_time_line_finished(self): def zoom_in(self): """Perform a zoom in with a fixed scaling.""" - self.gentle_zoom(self._zoom_factor_base ** self._angle) + self.gentle_zoom(self._zoom_factor_base**self._angle) self._set_preferred_scene_rect() def zoom_out(self): """Perform a zoom out with a fixed scaling.""" - self.gentle_zoom(self._zoom_factor_base ** -self._angle) + self.gentle_zoom(self._zoom_factor_base**-self._angle) self._set_preferred_scene_rect() def gentle_zoom(self, factor, zoom_focus=None):