Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the version of black formatter #2737

Merged
merged 1 commit into from
Apr 30, 2024
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
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
black == 21.12b0
black == 24.4.2
pre-commit == 2.0.1
PyYAML >= 5.4
pylint >= 2.3.0
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion spinetoolbox/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions spinetoolbox/plotting.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 5 additions & 3 deletions spinetoolbox/spine_db_editor/mvcmodels/entity_tree_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions spinetoolbox/spine_db_editor/widgets/tabular_view_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion spinetoolbox/spine_db_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions spinetoolbox/widgets/custom_qgraphicsviews.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
self.time_line.start()
else:
angle = event.angleDelta().y()
factor = self._zoom_factor_base ** angle
factor = self._zoom_factor_base**angle

Check warning on line 192 in spinetoolbox/widgets/custom_qgraphicsviews.py

View check run for this annotation

Codecov / codecov/patch

spinetoolbox/widgets/custom_qgraphicsviews.py#L192

Added line #L192 was not covered by tests
self.gentle_zoom(factor, event.position().toPoint())
self._set_preferred_scene_rect()

Expand Down Expand Up @@ -273,12 +273,12 @@

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)

Check warning on line 276 in spinetoolbox/widgets/custom_qgraphicsviews.py

View check run for this annotation

Codecov / codecov/patch

spinetoolbox/widgets/custom_qgraphicsviews.py#L276

Added line #L276 was not covered by tests
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)

Check warning on line 281 in spinetoolbox/widgets/custom_qgraphicsviews.py

View check run for this annotation

Codecov / codecov/patch

spinetoolbox/widgets/custom_qgraphicsviews.py#L281

Added line #L281 was not covered by tests
self._set_preferred_scene_rect()

def gentle_zoom(self, factor, zoom_focus=None):
Expand Down