Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-02 07:18:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[pre-commit.ci] pre-commit autoupdate (#10372)

Browse Source 
* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.3.3 → v0.3.4](https://github.com/astral-sh/ruff-pre-commit/compare/v0.3.3...v0.3.4)

* fixes

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Saugat Pachhai (सौगात) <[email protected]>
This commit is contained in:
pre-commit-ci[bot]
2024-03-26 06:37:53 +00:00
committed by GitHub
co-authored by Saugat Pachhai
parent 519c47f5fc
commit 3375a7c39f
23 changed files with 50 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/func/experiments/test_show.py
+3 -3
View File
@@ -101,7 +101,7 @@ def test_show_simple(tmp_dir, scm, dvc, exp_stage):
@pytest.mark.parametrize("workspace", [True, False])
def test_show_experiment(tmp_dir, scm, dvc, exp_stage, workspace):
baseline_rev = scm.get_rev()
timestamp = datetime.fromtimestamp(
timestamp = datetime.fromtimestamp( # noqa: DTZ006
scm.gitpython.repo.rev_parse(baseline_rev).committed_date
)
@@ -423,7 +423,7 @@ def test_show_csv(tmp_dir, scm, dvc, exp_stage, capsys):
baseline_rev = scm.get_rev()
def _get_rev_isotimestamp(rev):
return datetime.fromtimestamp(
return datetime.fromtimestamp( # noqa: DTZ006
scm.gitpython.repo.rev_parse(rev).committed_date
).isoformat()
@@ -652,7 +652,7 @@ def test_metrics_renaming(tmp_dir, dvc, scm, capsys, copy_script):
cap = capsys.readouterr()
def _get_rev_isotimestamp(rev):
return datetime.fromtimestamp(
return datetime.fromtimestamp( # noqa: DTZ006
scm.gitpython.repo.rev_parse(rev).committed_date
).isoformat()
tests/func/test_gc.py
+1 -1
View File
@@ -297,7 +297,7 @@ def test_gc_rev_num(tmp_dir, scm, dvc):
def test_date(tmp_dir, scm, dvc):
tmp_dir.dvc_gen("testfile", "content", commit="add testfile")
now = datetime.datetime.now()
now = datetime.datetime.now(tz=datetime.timezone.utc)
datestamp = (now.date() + datetime.timedelta(days=1)).isoformat()
tmp_dir.dvc_gen("testfile", "modified", commit="modified")
tests/unit/command/test_dataset.py
+4 -4
View File
@@ -1,4 +1,4 @@
from datetime import datetime
from datetime import datetime, timezone
import pytest
@@ -15,7 +15,7 @@ from dvc.cli import main
),
(
{"name": "mydataset", "url": "dvcx://dataset", "type": "dvcx"},
{"rev_lock": "0" * 40, "version": 1, "created_at": datetime.now()},
{"version": 1, "created_at": datetime.now(tz=timezone.utc)},
"Adding mydataset (dvcx://dataset @ v1)\n",
),
(
@@ -65,7 +65,7 @@ def test_add_already_exists(dvc, caplog, mocker):
),
(
{"name": "mydataset", "url": "dvcx://dataset", "type": "dvcx"},
{"rev_lock": "0" * 40, "version": 1, "created_at": datetime.now()},
{"version": 1, "created_at": datetime.now(tz=timezone.utc)},
{"version": 2},
{
"missing": "Updating mydataset (dvcx://dataset @ v2)\n",
@@ -75,7 +75,7 @@ def test_add_already_exists(dvc, caplog, mocker):
),
(
{"name": "mydataset", "url": "dvcx://dataset", "type": "dvcx"},
{"rev_lock": "0" * 40, "version": 2, "created_at": datetime.now()},
{"version": 2, "created_at": datetime.now(tz=timezone.utc)},
{"version": 1},
{
"missing": "Updating mydataset (dvcx://dataset @ v1)\n",
tests/unit/command/test_queue.py
+2 -2
View File
@@ -166,13 +166,13 @@ def test_experiments_status(dvc, scm, mocker, capsys):
{
"rev": "c61a525a4ff39007301b4516fb6e54b323a0587b",
"name": "I40",
"timestamp": datetime(2022, 6, 9, 20, 49, 48),
"timestamp": datetime(2022, 6, 9, 20, 49, 48), # noqa: DTZ001
"status": "Queued",
},
{
"rev": "8da9c339da30636261a3491a90aafdb760a4168f",
"name": "I60",
"timestamp": datetime(2022, 6, 9, 20, 49, 43),
"timestamp": datetime(2022, 6, 9, 20, 49, 43), # noqa: DTZ001
"status": "Running",
},
]
tests/unit/repo/experiments/queue/test_celery.py
+8 -8
View File
@@ -189,13 +189,13 @@ def test_queue_status(test_queue, scm, mocker):
def resolve_commit(rev):
if rev == "active":
commit_time = datetime(2022, 8, 7).timestamp()
commit_time = datetime(2022, 8, 7).timestamp() # noqa: DTZ001
elif rev == "queued":
commit_time = datetime(2022, 8, 6).timestamp()
commit_time = datetime(2022, 8, 6).timestamp() # noqa: DTZ001
elif rev == "failed":
commit_time = datetime(2022, 8, 5).timestamp()
commit_time = datetime(2022, 8, 5).timestamp() # noqa: DTZ001
elif rev == "success":
commit_time = datetime(2022, 8, 4).timestamp()
commit_time = datetime(2022, 8, 4).timestamp() # noqa: DTZ001
return mocker.Mock(commit_time=commit_time)
mocker.patch.object(
@@ -230,24 +230,24 @@ def test_queue_status(test_queue, scm, mocker):
"name": "foo",
"rev": "active",
"status": "Running",
"timestamp": datetime(2022, 8, 7, 0, 0, 0),
"timestamp": datetime(2022, 8, 7, 0, 0, 0), # noqa: DTZ001
},
{
"name": None,
"rev": "queued",
"status": "Queued",
"timestamp": datetime(2022, 8, 6, 0, 0, 0),
"timestamp": datetime(2022, 8, 6, 0, 0, 0), # noqa: DTZ001
},
{
"name": "bar",
"rev": "failed",
"status": "Failed",
"timestamp": datetime(2022, 8, 5, 0, 0, 0),
"timestamp": datetime(2022, 8, 5, 0, 0, 0), # noqa: DTZ001
},
{
"name": "foobar",
"rev": "success",
"status": "Success",
"timestamp": datetime(2022, 8, 4, 0, 0, 0),
"timestamp": datetime(2022, 8, 4, 0, 0, 0), # noqa: DTZ001
},
]
tests/unit/repo/experiments/test_collect.py
+1 -1
View File
@@ -22,7 +22,7 @@ def test_collect_stable_sorting(dvc, scm, mocker):
]
def collect_queued_patched(_, baseline_revs) -> dict[str, list["ExpRange"]]:
single_timestamp = datetime.datetime(2023, 6, 20, 0, 0, 0)
single_timestamp = datetime.datetime(2023, 6, 20, 0, 0, 0) # noqa: DTZ001
exp_ranges = [
ExpRange(
tests/unit/scm/test_scm.py
+4 -4
View File
@@ -68,7 +68,7 @@ def test_iter_revs(tmp_dir, scm, mocker):
if rev == rev_root:
return GitCommit(
"dummy",
commit_time=datetime(2022, 6, 28).timestamp(),
commit_time=datetime(2022, 6, 28).timestamp(), # noqa: DTZ001
commit_time_offset=0,
message="dummy",
parents=["dummy"],
@@ -76,14 +76,14 @@ def test_iter_revs(tmp_dir, scm, mocker):
committer_email="dummy",
author_name="dummy",
author_email="dummy",
author_time=datetime(2022, 6, 28).timestamp(),
author_time=datetime(2022, 6, 28).timestamp(), # noqa: DTZ001
author_time_offset=0,
)
if rev == rev_old:
raise SCMError
return GitCommit(
"dummy",
commit_time=datetime(2022, 6, 30).timestamp(),
commit_time=datetime(2022, 6, 30).timestamp(), # noqa: DTZ001
commit_time_offset=0,
message="dummy",
parents=["dummy"],
@@ -91,7 +91,7 @@ def test_iter_revs(tmp_dir, scm, mocker):
committer_email="dummy",
author_name="dummy",
author_email="dummy",
author_time=datetime(2022, 6, 28).timestamp(),
author_time=datetime(2022, 6, 28).timestamp(), # noqa: DTZ001
author_time_offset=0,
)
tests/unit/test_logger.py
+2 -1
View File
@@ -23,7 +23,8 @@ colors = {
@pytest.fixture
def dt(mocker):
mocker.patch(
"time.time", return_value=time.mktime(datetime(2020, 2, 2).timetuple())
"time.time",
return_value=time.mktime(datetime(2020, 2, 2).timetuple()), # noqa: DTZ001
)
return "2020-02-02 00:00:00,000"
tests/unit/ui/test_console.py
+1 -1
View File
@@ -47,7 +47,7 @@ def test_write_json(capsys, mocker, isatty, expected_output):
console = Console(enable=True)
mocker.patch.object(console, "isatty", return_value=isatty)
message = {"hello": "world", "date": datetime.datetime(1970, 1, 1)}
message = {"hello": "world", "date": datetime.datetime(1970, 1, 1)} # noqa: DTZ001
console.write_json(message, default=str)
captured = capsys.readouterr()
assert captured.out == expected_output
tests/unit/utils/test_fs.py
+1 -3
View File
@@ -43,9 +43,7 @@ def test_should_return_false_when_base_path_is_symlink(mocker):
target_path = os.path.join(base_path, "bar")
def base_path_is_symlink(path):
if path == base_path:
return True
return False
return path == base_path
mocker.patch.object(
system,