Skip to content

Commit

Permalink
[pre-commit.ci] pre-commit autoupdate (#10663)
Browse files Browse the repository at this point in the history
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
pre-commit-ci[bot] authored Jan 9, 2025
1 parent aea0e6b commit e70a1e9
Show file tree
Hide file tree
Showing 14 changed files with 26 additions and 40 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repos:
- id: sort-simple-yaml
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: 'v0.8.4'
rev: 'v0.9.0'
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
6 changes: 2 additions & 4 deletions dvc/pathspec_math.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@ def _remove_slash(rule):

def _match_all_level(rule):
if rule[:-1].find("/") >= 0 and not rule.startswith("**/"):
if rule.startswith("/"):
rule = rule[1:]
rule = rule.removeprefix("/")
return False, rule
if rule.startswith("**/"):
rule = rule[3:]
rule = rule.removeprefix("**/")
return True, rule


Expand Down
2 changes: 1 addition & 1 deletion dvc/repo/experiments/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def run( # noqa: C901, PLR0912

for idx, sweep_overrides in enumerate(sweeps):
if hydra_sweep and name_prefix is not None:
kwargs["name"] = f"{name_prefix}-{idx+1}"
kwargs["name"] = f"{name_prefix}-{idx + 1}"
queue_entry = repo.experiments.queue_one(
repo.experiments.celery_queue,
targets=targets,
Expand Down
3 changes: 1 addition & 2 deletions dvc/testing/benchmarks/fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,7 @@ def dvc_bin(request, make_dvc_bin):
version = Version(parse(dvc_version).base_version)
if version not in spec:
pytest.skip(
f"Version {dvc_version} "
f"does not satisfy requirement {spec!r}: {reason}"
f"Version {dvc_version} does not satisfy requirement {spec!r}: {reason}"
)
return make_dvc_bin

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -264,14 +264,14 @@ show-fixes = true

[tool.ruff.lint]
ignore = [
"N818", "S101", "ISC001", "PT007", "RET502", "RET503", "SIM105", "SIM108", "SIM117",
"N818", "S101", "A005", "PT007", "RET502", "RET503", "SIM105", "SIM108", "SIM117",
"TRY003", "TRY300", "PERF203", "PLR2004", "PLW2901", "LOG007",
]
select = [
"F", "E", "W", "C90", "I", "N", "UP", "YTT", "ASYNC", "S", "BLE", "B", "A", "C4", "DTZ", "T10",
"EXE", "ISC", "ICN", "LOG", "G", "INP", "PIE", "T20", "PYI", "PT", "Q", "RSE", "RET",
"SLOT", "SIM", "TID", "TC", "ARG", "PGH", "PLC", "PLE", "PLR", "PLW", "TRY",
"FLY", "PERF", "FURB", "RUF", "RUF027", "RUF029", "RUF034", "RUF036",
"FLY", "PERF", "FURB", "RUF", "RUF027", "RUF029", "RUF036",
]
preview = true
explicit-preview-rules = true
Expand Down
2 changes: 1 addition & 1 deletion tests/func/experiments/test_set_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def test_hydra_sweep_prefix_name(tmp_dir, params_repo, dvc):
db_values = ["mysql", "postgresql"]
param = "+db=" + ",".join(db_values)
dvc.experiments.run(params=[param], queue=True, name=prefix)
expected_names = [f"{prefix}-{i+1}" for i, _ in enumerate(db_values)]
expected_names = [f"{prefix}-{i + 1}" for i, _ in enumerate(db_values)]
exp_names = [entry.name for entry in dvc.experiments.celery_queue.iter_queued()]
for name, expected in zip(exp_names, expected_names):
assert name == expected
7 changes: 2 additions & 5 deletions tests/func/plots/test_show.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,8 @@ def _get_plot_defn(rel_dir: str) -> dict:

dvclive_metrics_dir.gen(
{
"Error.tsv": "step\tError\n" "0\t0.11\n" "1\t0.22\n" "2\t0.44\n",
"Max_Leaf_Nodes.tsv": "step\tMax_Leaf_Nodes\n"
"0\t5\n"
"1\t50\n"
"2\t500\n",
"Error.tsv": "step\tError\n0\t0.11\n1\t0.22\n2\t0.44\n",
"Max_Leaf_Nodes.tsv": "step\tMax_Leaf_Nodes\n0\t5\n1\t50\n2\t500\n",
}
)

Expand Down
2 changes: 1 addition & 1 deletion tests/func/test_merge_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def test_merge_different_output_options(tmp_dir, dvc, caplog):
)

(tmp_dir / "their").write_text(
"outs:\n"
r"outs:\n"
"- md5: f987654321.dir\n"
" hash: md5\n"
" path: path\n"
Expand Down
12 changes: 6 additions & 6 deletions tests/func/test_repo_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,13 @@ def assert_index_equal(first, second, strict=True, ordered=True):
assert len(first) == len(second), "Index have different no. of stages"
assert set(first) == set(second), "Index does not have same stages"
if ordered:
assert list(first) == list(
second
), "Index does not have same sequence of stages"
assert list(first) == list(second), (
"Index does not have same sequence of stages"
)
if strict:
assert set(map(id, first)) == set(
map(id, second)
), "Index is not strictly equal"
assert set(map(id, first)) == set(map(id, second)), (
"Index is not strictly equal"
)


def test_skip_graph_checks(dvc, mocker):
Expand Down
7 changes: 2 additions & 5 deletions tests/integration/plots/test_plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -553,11 +553,8 @@ def test_nested_x_defn_collection(tmp_dir, dvc, scm, capsys):
)
dvclive_metrics_dir.gen(
{
"Error.tsv": "step\tError\n" "0\t0.11\n" "1\t0.22\n" "2\t0.44\n",
"Max_Leaf_Nodes.tsv": "step\tMax_Leaf_Nodes\n"
"0\t5\n"
"1\t50\n"
"2\t500\n",
"Error.tsv": "step\tError\n0\t0.11\n1\t0.22\n2\t0.44\n",
"Max_Leaf_Nodes.tsv": "step\tMax_Leaf_Nodes\n0\t5\n1\t50\n2\t500\n",
}
)
(other_logger_dir / "multiple_metrics.json").dump(
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/command/test_dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def test_add_already_exists(dvc, caplog, mocker):
"missing": "Updating mydataset (s3://bucket/path)\n",
"unchanged": "Nothing to update\n",
"updated": (
"Updating mydataset (s3://bucket/path)\n"
r"Updating mydataset (s3://bucket/path)\n"
"M\tbaz\n"
"A\tfoobar\n"
"D\tfoo\n"
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/fs/test_dvc_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,6 @@ def test_info_on_subrepos(make_tmp_dir, tmp_dir, dvc, scm, dvcfs):

for path in ["subrepo", "subrepo/foo", "subrepo/foobar"]:
info = dvcfs.info(path)
assert info["repo"].root_dir == str(
subrepo
), f"repo root didn't match for {path}"
assert info["repo"].root_dir == str(subrepo), (
f"repo root didn't match for {path}"
)
3 changes: 1 addition & 2 deletions tests/unit/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,5 @@ def test_feature_section_supports_arbitrary_values(caplog):
assert "random_key_1" not in data
assert "random_key_2" not in data
assert (
"'feature.random_key_1', 'feature.random_key_2' "
"config options are unsupported"
"'feature.random_key_1', 'feature.random_key_2' config options are unsupported"
) in caplog.text
8 changes: 2 additions & 6 deletions tests/unit/test_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,7 @@ def test_exception_under_verbose(self, caplog, dt):
logger.exception("")

expected = (
"{red}{datetime}{nc} "
"{red}ERROR{nc}: description\n"
"{stack_trace}".format(
"{red}{datetime}{nc} {red}ERROR{nc}: description\n{stack_trace}".format(
stack_trace=stack_trace,
**colors,
datetime=dt,
Expand Down Expand Up @@ -144,9 +142,7 @@ def test_tb_only(self, caplog, dt):
logger.exception("something", extra={"tb_only": True})

expected = (
"{red}{datetime}{nc} "
"{red}ERROR{nc}: something\n"
"{stack_trace}".format(
"{red}{datetime}{nc} {red}ERROR{nc}: something\n{stack_trace}".format(
stack_trace=stack_trace,
**colors,
datetime=dt,
Expand Down

0 comments on commit e70a1e9

Please sign in to comment.