Skip to content

Commit ecdc1da

Browse files
[pre-commit.ci] pre-commit autoupdate (#408)
* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/astral-sh/ruff-pre-commit: v0.8.6 → v0.9.4](astral-sh/ruff-pre-commit@v0.8.6...v0.9.4) - [github.com/codespell-project/codespell: v2.3.0 → v2.4.1](codespell-project/codespell@v2.3.0...v2.4.1) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix pre-commit --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: lkstrp <[email protected]>
1 parent cc9b4f9 commit ecdc1da

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repos:
99
- id: trailing-whitespace
1010
- id: check-merge-conflict
1111
- repo: https://github.com/astral-sh/ruff-pre-commit
12-
rev: v0.8.6
12+
rev: v0.9.4
1313
hooks:
1414
- id: ruff
1515
args: [--fix]
@@ -25,7 +25,7 @@ repos:
2525
hooks:
2626
- id: blackdoc
2727
- repo: https://github.com/codespell-project/codespell
28-
rev: v2.3.0
28+
rev: v2.4.1
2929
hooks:
3030
- id: codespell
3131
types_or: [python, rst, markdown]

linopy/constraints.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,10 @@ def __repr__(self):
319319
elif size == 1:
320320
expr = print_single_expression(self.coeffs, self.vars, 0, self.model)
321321
lines.append(
322-
f"{header_string}\n{'-'*len(header_string)}\n{expr} {SIGNS_pretty[self.sign.item()]} {self.rhs.item()}"
322+
f"{header_string}\n{'-' * len(header_string)}\n{expr} {SIGNS_pretty[self.sign.item()]} {self.rhs.item()}"
323323
)
324324
else:
325-
lines.append(f"{header_string}\n{'-'*len(header_string)}\n<empty>")
325+
lines.append(f"{header_string}\n{'-' * len(header_string)}\n<empty>")
326326

327327
return "\n".join(lines)
328328

linopy/io.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ def to_lp_file(
346346
)
347347
f.write("end\n")
348348

349-
logger.info(f" Writing time: {round(time.time()-start, 2)}s")
349+
logger.info(f" Writing time: {round(time.time() - start, 2)}s")
350350

351351

352352
def objective_write_linear_terms_polars(f, df):
@@ -394,14 +394,14 @@ def objective_to_file_polars(m, f, progress=False):
394394
objective_write_linear_terms_polars(f, df)
395395

396396
elif m.is_quadratic:
397-
lins = df.filter(pl.col("vars1").eq(-1) | pl.col("vars2").eq(-1))
398-
lins = lins.with_columns(
397+
linear_terms = df.filter(pl.col("vars1").eq(-1) | pl.col("vars2").eq(-1))
398+
linear_terms = linear_terms.with_columns(
399399
pl.when(pl.col("vars1").eq(-1))
400400
.then(pl.col("vars2"))
401401
.otherwise(pl.col("vars1"))
402402
.alias("vars")
403403
)
404-
objective_write_linear_terms_polars(f, lins)
404+
objective_write_linear_terms_polars(f, linear_terms)
405405

406406
quads = df.filter(pl.col("vars1").ne(-1) & pl.col("vars2").ne(-1))
407407
objective_write_quadratic_terms_polars(f, quads)
@@ -586,7 +586,7 @@ def to_lp_file_polars(
586586
)
587587
f.write(b"end\n")
588588

589-
logger.info(f" Writing time: {round(time.time()-start, 2)}s")
589+
logger.info(f" Writing time: {round(time.time() - start, 2)}s")
590590

591591

592592
def to_file(

linopy/model.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,9 +635,9 @@ def add_constraints(
635635
if mask is not None:
636636
mask = as_dataarray(mask).astype(bool)
637637
# TODO: simplify
638-
assert set(mask.dims).issubset(
639-
data.dims
640-
), "Dimensions of mask not a subset of resulting labels dimensions."
638+
assert set(mask.dims).issubset(data.dims), (
639+
"Dimensions of mask not a subset of resulting labels dimensions."
640+
)
641641

642642
self.check_force_dim_names(data)
643643

linopy/variables.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,11 @@ def __repr__(self) -> str:
351351
mask_str = f" - {masked_entries} masked entries" if masked_entries else ""
352352
lines.insert(
353353
0,
354-
f"Variable ({shape_str}){mask_str}\n{'-'* (len(shape_str) + len(mask_str) + 11)}",
354+
f"Variable ({shape_str}){mask_str}\n{'-' * (len(shape_str) + len(mask_str) + 11)}",
355355
)
356356
else:
357357
lines.append(
358-
f"Variable\n{'-'*8}\n{print_single_variable(self.model, self.labels.item())}"
358+
f"Variable\n{'-' * 8}\n{print_single_variable(self.model, self.labels.item())}"
359359
)
360360

361361
return "\n".join(lines)
@@ -1111,9 +1111,9 @@ def __getitem__(self, keys: Any) -> ScalarVariable:
11111111
# return single scalar
11121112
if not object.labels.ndim:
11131113
return ScalarVariable(object.labels.item(), object.model)
1114-
assert object.labels.ndim == len(
1115-
keys
1116-
), f"expected {object.labels.ndim} keys, got {len(keys)}."
1114+
assert object.labels.ndim == len(keys), (
1115+
f"expected {object.labels.ndim} keys, got {len(keys)}."
1116+
)
11171117
key = dict(zip(object.labels.dims, keys))
11181118
keys = [object.labels.get_index(k).get_loc(v) for k, v in key.items()]
11191119
return ScalarVariable(object.labels.data[tuple(keys)], object.model)

0 commit comments

Comments
 (0)