Skip to content

Commit 8124a37

Browse files
committed
Merge branch 'main' into fix/misc
2 parents 1af84ae + 8503f74 commit 8124a37

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
with:
6161
github_token: ${{ secrets.GITHUB_TOKEN }}
6262
branch: ${{ github.head_ref }}
63+
force: true
6364

6465
- name: Check that docs can be built + Lint python docstrings with numpydoc (through Sphinx)
6566
# Will FAIL if Sphinx throws any warnings/errors or if any numpydoc lint rule is violated

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
2828
- name: Check for changed python files
2929
id: changed-py-files
30-
uses: tj-actions/changed-files@v44
30+
uses: tj-actions/changed-files@v46
3131
with:
3232
base_sha: ${{ env.main_sha }}
3333
files: '**/*.py'

src/docplex_extensions/_dict_mixins.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def value_name(self, new: str | None) -> None:
168168
def _get_repr_header(self) -> str:
169169
# Header for repr.
170170
if self.key_names is not None and self.value_name is not None:
171-
return f"{self.__class__.__name__}: ({', '.join(self.key_names)}) -> {self.value_name}"
171+
return f'{self.__class__.__name__}: ({", ".join(self.key_names)}) -> {self.value_name}'
172172
else:
173173
return f'{self.__class__.__name__}:'
174174

src/docplex_extensions/_index_sets.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,7 @@ def __delitem__(self, index: SupportsIndex | slice, /) -> None:
288288
self._remove_elements(old_multiple)
289289
case _:
290290
raise TypeError(
291-
'position indices must be integers or slices, not '
292-
f'{type(index).__name__}'
291+
f'position indices must be integers or slices, not {type(index).__name__}'
293292
)
294293
del self._list[index]
295294
except IndexError:
@@ -952,7 +951,7 @@ def names(self, value: Sequence[str] | None) -> None:
952951
def _get_repr_header(self) -> str:
953952
# Header for repr.
954953
if self.names is not None:
955-
return f"{self.__class__.__name__}: ({', '.join(self.names)})"
954+
return f'{self.__class__.__name__}: ({", ".join(self.names)})'
956955
else:
957956
return f'{self.__class__.__name__}:'
958957

src/docplex_extensions/_tuning_funcs.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,13 +211,13 @@ def _tune(
211211
if not (tuning_name == 'tune.repeat' and batch_mode) and not (
212212
tuning_name == 'tune.measure' and not batch_mode
213213
):
214-
log_header += f' {tuning_name :<40} {tuning_val}\n'
214+
log_header += f' {tuning_name:<40} {tuning_val}\n'
215215

216216
# Log fixed params
217217
log_header += '\nFixed parameters:\n'
218218
if fixed_params_and_values:
219219
for fixed_name, fixed_val in fixed_params_and_values.items():
220-
log_header += f' {fixed_name :<40} {fixed_val}\n'
220+
log_header += f' {fixed_name:<40} {fixed_val}\n'
221221
else:
222222
log_header += ' None\n'
223223

@@ -246,7 +246,7 @@ def _tune(
246246
if improving_params_and_values: # pragma: no cover
247247
log_footer += 'Tuned parameters:\n'
248248
for tuned_name, tuned_val in improving_params_and_values.items():
249-
log_footer += f' {tuned_name :<40} {tuned_val}\n'
249+
log_footer += f' {tuned_name:<40} {tuned_val}\n'
250250
else:
251251
log_footer += 'The tuning tool could not find a better set of parameters\n'
252252

0 commit comments

Comments
 (0)