This commit is contained in:
skshetry
2025-12-01 15:52:37 +05:45
committed by GitHub
parent cf5168af74
commit cb96cf1487
42 changed files with 66 additions and 72 deletions
+4 -4
View File
@@ -737,8 +737,8 @@
"tests/func/test_config.py::test_config_gdrive_fields": 0.12703910000016094, "tests/func/test_config.py::test_config_gdrive_fields": 0.12703910000016094,
"tests/func/test_config.py::test_config_get[args0-0-False]": 0.20948869999995168, "tests/func/test_config.py::test_config_get[args0-0-False]": 0.20948869999995168,
"tests/func/test_config.py::test_config_get[args1-0-myremote]": 0.1829517000001033, "tests/func/test_config.py::test_config_get[args1-0-myremote]": 0.1829517000001033,
"tests/func/test_config.py::test_config_get[args2-0-iterative]": 0.19686669999998685, "tests/func/test_config.py::test_config_get[args2-0-treeverse]": 0.19686669999998685,
"tests/func/test_config.py::test_config_get[args3-0-iterative]": 0.1675059000000374, "tests/func/test_config.py::test_config_get[args3-0-treeverse]": 0.1675059000000374,
"tests/func/test_config.py::test_config_get[args4-251-option 'profile' doesn't exist]": 0.18096200000002227, "tests/func/test_config.py::test_config_get[args4-251-option 'profile' doesn't exist]": 0.18096200000002227,
"tests/func/test_config.py::test_config_get[args5-0-gs://bucket/path]": 0.12368970000022728, "tests/func/test_config.py::test_config_get[args5-0-gs://bucket/path]": 0.12368970000022728,
"tests/func/test_config.py::test_config_get[args6-0-gs://bucket/path]": 0.13007389999995667, "tests/func/test_config.py::test_config_get[args6-0-gs://bucket/path]": 0.13007389999995667,
@@ -2642,7 +2642,7 @@
"tests/unit/test_updater.py::test_is_enabled[config0-True]": 0.13130560000013247, "tests/unit/test_updater.py::test_is_enabled[config0-True]": 0.13130560000013247,
"tests/unit/test_updater.py::test_is_enabled[config1-True]": 0.14342600000009043, "tests/unit/test_updater.py::test_is_enabled[config1-True]": 0.14342600000009043,
"tests/unit/test_updater.py::test_is_enabled[config2-False]": 0.13593219999984285, "tests/unit/test_updater.py::test_is_enabled[config2-False]": 0.13593219999984285,
"tests/unit/test_updater.py::test_notify_message[None-Find the latest release at https://github.com/iterative/dvc/releases/latest.]": 0.014024399999925663, "tests/unit/test_updater.py::test_notify_message[None-Find the latest release at https://github.com/treeverse/dvc/releases/latest.]": 0.014024399999925663,
"tests/unit/test_updater.py::test_notify_message[binary-To upgrade, uninstall dvc and reinstall from https://dvc.org.]": 0.013217200000326557, "tests/unit/test_updater.py::test_notify_message[binary-To upgrade, uninstall dvc and reinstall from https://dvc.org.]": 0.013217200000326557,
"tests/unit/test_updater.py::test_notify_message[brew-To upgrade, run 'brew upgrade dvc'.]": 0.013467300000229443, "tests/unit/test_updater.py::test_notify_message[brew-To upgrade, run 'brew upgrade dvc'.]": 0.013467300000229443,
"tests/unit/test_updater.py::test_notify_message[choco-To upgrade, run 'choco upgrade dvc'.]": 0.014645900000004985, "tests/unit/test_updater.py::test_notify_message[choco-To upgrade, run 'choco upgrade dvc'.]": 0.014645900000004985,
@@ -2652,7 +2652,7 @@
"tests/unit/test_updater.py::test_notify_message[osxpkg-To upgrade, uninstall dvc and reinstall from https://dvc.org.]": 0.013980499999888707, "tests/unit/test_updater.py::test_notify_message[osxpkg-To upgrade, uninstall dvc and reinstall from https://dvc.org.]": 0.013980499999888707,
"tests/unit/test_updater.py::test_notify_message[pip-To upgrade, run 'pip install --upgrade dvc'.]": 0.015155299999833005, "tests/unit/test_updater.py::test_notify_message[pip-To upgrade, run 'pip install --upgrade dvc'.]": 0.015155299999833005,
"tests/unit/test_updater.py::test_notify_message[rpm-To upgrade, run 'yum update dvc'.]": 0.014036500000202068, "tests/unit/test_updater.py::test_notify_message[rpm-To upgrade, run 'yum update dvc'.]": 0.014036500000202068,
"tests/unit/test_updater.py::test_notify_message[unknown-Find the latest release at https://github.com/iterative/dvc/releases/latest.]": 0.01609110000003966, "tests/unit/test_updater.py::test_notify_message[unknown-Find the latest release at https://github.com/treeverse/dvc/releases/latest.]": 0.01609110000003966,
"tests/unit/ui/test_console.py::test_capsys_works": 0.003642499999841675, "tests/unit/ui/test_console.py::test_capsys_works": 0.003642499999841675,
"tests/unit/ui/test_console.py::test_write": 0.004320600000255581, "tests/unit/ui/test_console.py::test_write": 0.004320600000255581,
"tests/unit/ui/test_console.py::test_write_json[False-{\"hello\": \"world\", \"date\": \"1970-01-01 00:00:00\"}\\n]": 0.004433300000073359, "tests/unit/ui/test_console.py::test_write_json[False-{\"hello\": \"world\", \"date\": \"1970-01-01 00:00:00\"}\\n]": 0.004433300000073359,
+1 -1
View File
@@ -57,7 +57,7 @@ $ dvc doctor
**Additional Information (if any):** **Additional Information (if any):**
<!-- <!--
Please check https://github.com/iterative/dvc/wiki/Debugging-DVC on ways to gather more information regarding the issue. Please check https://github.com/treeverse/dvc/wiki/Debugging-DVC on ways to gather more information regarding the issue.
If applicable, please also provide a `--verbose` output of the command, eg: `dvc add --verbose`. If applicable, please also provide a `--verbose` output of the command, eg: `dvc add --verbose`.
If the issue is regarding the performance, please attach the profiling information and the benchmark comparisons. If the issue is regarding the performance, please attach the profiling information and the benchmark comparisons.
+1 -1
View File
@@ -1,5 +1,5 @@
* [ ] ❗ I have followed the [Contributing to DVC](https://dvc.org/doc/user-guide/contributing/core) checklist. * [ ] ❗ I have followed the [Contributing to DVC](https://dvc.org/doc/user-guide/contributing/core) checklist.
* [ ] 📖 If this PR requires [documentation](https://dvc.org/doc) updates, I have created a separate PR (or issue, at least) in [dvc.org](https://github.com/iterative/dvc.org) and linked it here. * [ ] 📖 If this PR requires [documentation](https://dvc.org/doc) updates, I have created a separate PR (or issue, at least) in [dvc.org](https://github.com/treeverse/dvc.org) and linked it here.
Thank you for the contribution - we'll try to review it as soon as possible. 🙏 Thank you for the contribution - we'll try to review it as soon as possible. 🙏
+1 -1
View File
@@ -4,5 +4,5 @@
"data-science", "data-version-control", "machine-learning", "git", "data-science", "data-version-control", "machine-learning", "git",
"developer-tools", "reproducibility", "collaboration", "ai", "python"], "developer-tools", "reproducibility", "collaboration", "ai", "python"],
"contributors": [ "contributors": [
{"name": "DVC team", "type": "Other", "affiliation": "Iterative"}] {"name": "DVC team", "type": "Other", "affiliation": "Treeverse"}]
} }
+2 -8
View File
@@ -198,8 +198,6 @@ Fedora / CentOS (rpm)
Contributing Contributing
============ ============
|Maintainability|
Contributions are welcome! Contributions are welcome!
Please see our `Contributing Guide <https://dvc.org/doc/user-guide/contributing/core>`_ for more details. Please see our `Contributing Guide <https://dvc.org/doc/user-guide/contributing/core>`_ for more details.
Thanks to all our contributors! Thanks to all our contributors!
@@ -244,16 +242,12 @@ Barrak, A., Eghan, E.E. and Adams, B. `On the Co-evolution of ML Pipelines and S
:target: https://github.com/treeverse/dvc/actions/workflows/tests.yaml :target: https://github.com/treeverse/dvc/actions/workflows/tests.yaml
:alt: GHA Tests :alt: GHA Tests
.. |Maintainability| image:: https://img.shields.io/codeclimate/maintainability/iterative/dvc
:target: https://codeclimate.com/github/iterative/dvc
:alt: Code Climate
.. |Python Version| image:: https://img.shields.io/pypi/pyversions/dvc .. |Python Version| image:: https://img.shields.io/pypi/pyversions/dvc
:target: https://pypi.org/project/dvc :target: https://pypi.org/project/dvc
:alt: Python Version :alt: Python Version
.. |Coverage| image:: https://codecov.io/gh/iterative/dvc/branch/main/graph/badge.svg .. |Coverage| image:: https://codecov.io/gh/treeverse/dvc/branch/main/graph/badge.svg
:target: https://codecov.io/gh/iterative/dvc :target: https://codecov.io/gh/treeverse/dvc
:alt: Codecov :alt: Codecov
.. |Snap| image:: https://img.shields.io/badge/snap-install-82BEA0.svg?logo=snapcraft .. |Snap| image:: https://img.shields.io/badge/snap-install-82BEA0.svg?logo=snapcraft
+1 -1
View File
@@ -206,7 +206,7 @@ def add_debugging_flags(parser):
from argparse import SUPPRESS from argparse import SUPPRESS
# For detailed info see: # For detailed info see:
# https://github.com/iterative/dvc/wiki/Debugging,-Profiling-and-Benchmarking-DVC # https://github.com/treeverse/dvc/wiki/Debugging,-Profiling-and-Benchmarking-DVC
args, _ = parser.parse_known_args() args, _ = parser.parse_known_args()
verbose = args.verbose verbose = args.verbose
+2 -2
View File
@@ -508,7 +508,7 @@ class DvcIgnoreFilter:
def check_ignore(self, target: str) -> CheckIgnoreResult: def check_ignore(self, target: str) -> CheckIgnoreResult:
# NOTE: can only be used in `dvc check-ignore`, see # NOTE: can only be used in `dvc check-ignore`, see
# https://github.com/iterative/dvc/issues/5046 # https://github.com/treeverse/dvc/issues/5046
full_target = self.fs.abspath(target) full_target = self.fs.abspath(target)
matched_patterns: list[PatternInfo] = [] matched_patterns: list[PatternInfo] = []
ignore = False ignore = False
@@ -525,7 +525,7 @@ class DvcIgnoreFilter:
self, fs: "FileSystem", path: str, ignore_subrepos: bool = True self, fs: "FileSystem", path: str, ignore_subrepos: bool = True
) -> bool: ) -> bool:
# NOTE: can't use self.check_ignore(path).match for now, see # NOTE: can't use self.check_ignore(path).match for now, see
# https://github.com/iterative/dvc/issues/4555 # https://github.com/treeverse/dvc/issues/4555
if fs.protocol != Schemes.LOCAL: if fs.protocol != Schemes.LOCAL:
return False return False
if fs.isfile(path): if fs.isfile(path):
+1 -1
View File
@@ -158,7 +158,7 @@ def _get_fs_type(path):
except PermissionError: except PermissionError:
pass pass
# need to follow the symlink: https://github.com/iterative/dvc/issues/5065 # need to follow the symlink: https://github.com/treeverse/dvc/issues/5065
path = pathlib.Path(path).resolve() path = pathlib.Path(path).resolve()
for parent in itertools.chain([path], path.parents): for parent in itertools.chain([path], path.parents):
+1 -1
View File
@@ -182,7 +182,7 @@ class HardlinkLock(flufl.lock.Lock, LockBase):
# number to generate the resulting lock file name, which is unique # number to generate the resulting lock file name, which is unique
# enough for our application. # enough for our application.
# #
# [1] https://github.com/iterative/dvc/issues/2582 # [1] https://github.com/treeverse/dvc/issues/2582
self._hostname = socket.gethostname() self._hostname = socket.gethostname()
self._lifetime = timedelta(days=365) # Lock for good by default self._lifetime = timedelta(days=365) # Lock for good by default
+1 -1
View File
@@ -40,7 +40,7 @@ def check_name_format(name: str) -> None:
def name_is_compatible(name: str) -> bool: def name_is_compatible(name: str) -> bool:
""" """
Only needed by DVCLive per iterative/dvclive#715 Only needed by DVCLive per treeverse/dvclive#715
Will be removed in future release. Will be removed in future release.
""" """
from gto.constants import assert_name_is_valid from gto.constants import assert_name_is_valid
+1 -1
View File
@@ -70,7 +70,7 @@ class LocalCeleryQueue(BaseStashQueue):
def celery(self) -> "FSApp": def celery(self) -> "FSApp":
from kombu.transport.filesystem import Channel from kombu.transport.filesystem import Channel
# related to https://github.com/iterative/dvc-task/issues/61 # related to https://github.com/treeverse/dvc-task/issues/61
Channel.QoS.restore_at_shutdown = False Channel.QoS.restore_at_shutdown = False
from dvc_task.app import FSApp from dvc_task.app import FSApp
+1 -1
View File
@@ -16,7 +16,7 @@ def pre_commit_install(scm: "Git") -> None:
config_path = os.path.join(scm.root_dir, ".pre-commit-config.yaml") config_path = os.path.join(scm.root_dir, ".pre-commit-config.yaml")
with modify_yaml(config_path) as config: with modify_yaml(config_path) as config:
entry = { entry = {
"repo": "https://github.com/iterative/dvc", "repo": "https://github.com/treeverse/dvc",
"rev": ".".join(map(str, version_tuple[:3])), "rev": ".".join(map(str, version_tuple[:3])),
"hooks": [ "hooks": [
{ {
+1 -1
View File
@@ -46,7 +46,7 @@ class SCMContext:
try: try:
add_no_submodules(self.scm, paths) add_no_submodules(self.scm, paths)
except UnsupportedIndexFormat: except UnsupportedIndexFormat:
link = "https://github.com/iterative/dvc/issues/610" link = "https://github.com/treeverse/dvc/issues/610"
add_cmd = self._make_git_add_cmd([relpath(path) for path in paths]) add_cmd = self._make_git_add_cmd([relpath(path) for path in paths])
logger.info("") logger.info("")
msg = ( msg = (
+2 -2
View File
@@ -51,7 +51,7 @@ def _warn_if_fish(executable):
"Be aware that it might cause problems by overwriting " "Be aware that it might cause problems by overwriting "
"your current environment variables with values defined " "your current environment variables with values defined "
"in 'config.fish', which might affect your command. See " "in 'config.fish', which might affect your command. See "
"https://github.com/iterative/dvc/issues/1307. " "https://github.com/treeverse/dvc/issues/1307. "
) )
@@ -99,7 +99,7 @@ def prepare_kwargs(stage, run_env=None):
# #
# [1] https://github.com/python/cpython/blob/3.7/Lib/subprocess.py # [1] https://github.com/python/cpython/blob/3.7/Lib/subprocess.py
# #L1426 # #L1426
# [2] https://github.com/iterative/dvc/issues/2506 # [2] https://github.com/treeverse/dvc/issues/2506
# #issuecomment-535396799 # #issuecomment-535396799
kwargs["shell"] = os.name == "nt" kwargs["shell"] = os.name == "nt"
return kwargs return kwargs
+1 -1
View File
@@ -4,7 +4,7 @@ dvc.testing.benchmarks
====================== ======================
Benchmark test definitions are now part of ``dvc.testing``. Benchmark test definitions are now part of ``dvc.testing``.
For CLI usage and `bench.dvc.org <https://bench.dvc.org>`_ details see `dvc-bench <https://github.com/iterative/dvc-bench>`_. For CLI usage and `bench.dvc.org <https://bench.dvc.org>`_ details see `dvc-bench <https://github.com/treeverse/dvc-bench>`_.
``dvc.testing.benchmarks`` structure: ``dvc.testing.benchmarks`` structure:
@@ -6,8 +6,8 @@ import pytest
"!=3.53.*,!=3.54.0", "!=3.53.*,!=3.54.0",
reason="Takes 10 mins to run. Regression in 3.53.0, fixed in 3.54.1", reason="Takes 10 mins to run. Regression in 3.53.0, fixed in 3.54.1",
) )
# Introduced in https://github.com/iterative/dvc/pull/10388. # Introduced in https://github.com/treeverse/dvc/pull/10388.
# Fixed in https://github.com/iterative/dvc/pull/10531. # Fixed in https://github.com/treeverse/dvc/pull/10531.
def test_import(bench_dvc, tmp_dir, scm, dvc, make_dataset, remote): def test_import(bench_dvc, tmp_dir, scm, dvc, make_dataset, remote):
dataset = make_dataset( dataset = make_dataset(
cache=False, files=False, dvcfile=True, commit=True, remote=True cache=False, files=False, dvcfile=True, commit=True, remote=True
+1 -1
View File
@@ -79,7 +79,7 @@ def dvc_bench_repo(tmp_path_factory, bench_config):
if url is None: if url is None:
pytest.skip( pytest.skip(
"--dvc-bench-repo is not set, " "--dvc-bench-repo is not set, "
"clone https://github.com/iterative/dvc-bench repository and set its path" "clone https://github.com/treeverse/dvc-bench repository and set its path"
) )
if os.path.isdir(url): if os.path.isdir(url):
+3 -3
View File
@@ -44,7 +44,7 @@ class TestRemote:
_check_status(status_dir, new=dir_hashes) _check_status(status_dir, new=dir_hashes)
# Move cache and check status # Move cache and check status
# See issue https://github.com/iterative/dvc/issues/4383 for details # See issue https://github.com/treeverse/dvc/issues/4383 for details
backup_dir = dvc.cache.local.path + ".backup" backup_dir = dvc.cache.local.path + ".backup"
shutil.move(dvc.cache.local.path, backup_dir) shutil.move(dvc.cache.local.path, backup_dir)
status = dvc.cloud.status(foo_hashes) status = dvc.cloud.status(foo_hashes)
@@ -116,7 +116,7 @@ class TestRemote:
@pytest.mark.xfail(raises=NotImplementedError, strict=False) @pytest.mark.xfail(raises=NotImplementedError, strict=False)
def test_pull_00_prefix(self, tmp_dir, dvc, remote, monkeypatch): def test_pull_00_prefix(self, tmp_dir, dvc, remote, monkeypatch):
# Related: https://github.com/iterative/dvc/issues/6089 # Related: https://github.com/treeverse/dvc/issues/6089
fs_type = type(dvc.cloud.get_remote_odb("upstream").fs) fs_type = type(dvc.cloud.get_remote_odb("upstream").fs)
monkeypatch.setattr(fs_type, "_ALWAYS_TRAVERSE", True, raising=False) monkeypatch.setattr(fs_type, "_ALWAYS_TRAVERSE", True, raising=False)
@@ -146,7 +146,7 @@ class TestRemote:
@pytest.mark.xfail(raises=NotImplementedError, strict=False) @pytest.mark.xfail(raises=NotImplementedError, strict=False)
def test_pull_no_00_prefix(self, tmp_dir, dvc, remote, monkeypatch): def test_pull_no_00_prefix(self, tmp_dir, dvc, remote, monkeypatch):
# Related: https://github.com/iterative/dvc/issues/6244 # Related: https://github.com/treeverse/dvc/issues/6244
fs_type = type(dvc.cloud.get_remote_odb("upstream").fs) fs_type = type(dvc.cloud.get_remote_odb("upstream").fs)
monkeypatch.setattr(fs_type, "_ALWAYS_TRAVERSE", True, raising=False) monkeypatch.setattr(fs_type, "_ALWAYS_TRAVERSE", True, raising=False)
+1 -1
View File
@@ -163,7 +163,7 @@ class Updater:
if pkg not in instructions: if pkg not in instructions:
return ( return (
"Find the latest release at " "Find the latest release at "
"[blue]https://github.com/iterative/dvc/releases/latest[/]." "[blue]https://github.com/treeverse/dvc/releases/latest[/]."
) )
instruction = instructions[pkg] instruction = instructions[pkg]
+1 -1
View File
@@ -91,7 +91,7 @@ def test_apply_untracked(tmp_dir, scm, dvc, exp_stage):
def test_apply_unchanged_head(tmp_dir, scm, dvc, exp_stage): def test_apply_unchanged_head(tmp_dir, scm, dvc, exp_stage):
# see https://github.com/iterative/dvc/issues/8764 # see https://github.com/treeverse/dvc/issues/8764
tmp_dir.gen("params.yaml", "foo: 2") tmp_dir.gen("params.yaml", "foo: 2")
scm.add(["dvc.yaml", "dvc.lock", "params.yaml", "metrics.yaml"]) scm.add(["dvc.yaml", "dvc.lock", "params.yaml", "metrics.yaml"])
scm.commit("commit foo=2") scm.commit("commit foo=2")
+1 -1
View File
@@ -26,7 +26,7 @@ def test_celery_logs(tmp_dir, scm, dvc, failed_exp_stage, follow, capsys, test_q
def test_queue_doesnt_remove_untracked_params_file(tmp_dir, dvc, scm): def test_queue_doesnt_remove_untracked_params_file(tmp_dir, dvc, scm):
"""Regression test for https://github.com/iterative/dvc/issues/7842""" """Regression test for https://github.com/treeverse/dvc/issues/7842"""
tmp_dir.gen("params.yaml", "foo: 1") tmp_dir.gen("params.yaml", "foo: 1")
stage = dvc.run(cmd="echo ${foo}", params=["foo"], name="echo-foo") stage = dvc.run(cmd="echo ${foo}", params=["foo"], name="echo-foo")
scm.add(["dvc.yaml", "dvc.lock", ".gitignore"]) scm.add(["dvc.yaml", "dvc.lock", ".gitignore"])
+1 -1
View File
@@ -105,7 +105,7 @@ def test_exp_save_include_untracked(tmp_dir, dvc, scm):
def test_exp_save_include_untracked_warning(tmp_dir, dvc, scm, mocker): def test_exp_save_include_untracked_warning(tmp_dir, dvc, scm, mocker):
"""Regression test for https://github.com/iterative/dvc/issues/9061""" """Regression test for https://github.com/treeverse/dvc/issues/9061"""
setup_stage(tmp_dir, dvc, scm) setup_stage(tmp_dir, dvc, scm)
new_dir = tmp_dir / "new_dir" new_dir = tmp_dir / "new_dir"
+1 -1
View File
@@ -148,7 +148,7 @@ def test_downstream(M, tmp_dir, dvc):
assert [stage.name for stage in evaluation] == ["B-gen", "D-gen", "E-gen"] assert [stage.name for stage in evaluation] == ["B-gen", "D-gen", "E-gen"]
# B, C should be run (in any order) before D # B, C should be run (in any order) before D
# See https://github.com/iterative/dvc/issues/3602 # See https://github.com/treeverse/dvc/issues/3602
evaluation = dvc.reproduce(PROJECT_FILE + ":A-gen", downstream=True, force=True) evaluation = dvc.reproduce(PROJECT_FILE + ":A-gen", downstream=True, force=True)
assert len(evaluation) == 5 assert len(evaluation) == 5
+1 -1
View File
@@ -36,7 +36,7 @@ def test_repro_allow_missing_and_pull(tmp_dir, dvc, mocker, local_remote):
def test_repro_allow_missing_upstream_stage_modified( def test_repro_allow_missing_upstream_stage_modified(
tmp_dir, dvc, mocker, local_remote tmp_dir, dvc, mocker, local_remote
): ):
"""https://github.com/iterative/dvc/issues/9530""" """https://github.com/treeverse/dvc/issues/9530"""
tmp_dir.gen("params.yaml", "param: 1") tmp_dir.gen("params.yaml", "param: 1")
dvc.stage.add( dvc.stage.add(
name="create-foo", cmd="echo ${param} > foo", params=["param"], outs=["foo"] name="create-foo", cmd="echo ${param} > foo", params=["param"], outs=["foo"]
+1 -1
View File
@@ -723,7 +723,7 @@ def test_add_symlink_file(tmp_dir, dvc):
).is_symlink() ).is_symlink()
# Test that subsequent add succeeds # Test that subsequent add succeeds
# See https://github.com/iterative/dvc/issues/4654 # See https://github.com/treeverse/dvc/issues/4654
dvc.add(os.path.join("dir", "foo")) dvc.add(os.path.join("dir", "foo"))
+6 -6
View File
@@ -88,8 +88,8 @@ def test_config_set_in_non_dvc_repo(tmp_dir, caplog):
[ [
(["core.analytics"], 0, "False"), (["core.analytics"], 0, "False"),
(["core.remote"], 0, "myremote"), (["core.remote"], 0, "myremote"),
(["remote.myremote.profile"], 0, "iterative"), (["remote.myremote.profile"], 0, "treeverse"),
(["remote.myremote.profile", "--local"], 0, "iterative"), (["remote.myremote.profile", "--local"], 0, "treeverse"),
( (
["remote.myremote.profile", "--project"], ["remote.myremote.profile", "--project"],
251, 251,
@@ -122,7 +122,7 @@ def test_config_get(tmp_dir, dvc, capsys, caplog, args, ret, msg):
textwrap.dedent( textwrap.dedent(
"""\ """\
['remote "myremote"'] ['remote "myremote"']
profile = iterative profile = treeverse
['remote "other"'] ['remote "other"']
url = gs://bucket/path url = gs://bucket/path
""" """
@@ -167,7 +167,7 @@ def test_config_list(tmp_dir, dvc, capsys):
textwrap.dedent( textwrap.dedent(
"""\ """\
['remote "myremote"'] ['remote "myremote"']
profile = iterative profile = treeverse
access_key_id = abcde access_key_id = abcde
secret_access_key = 123456 secret_access_key = 123456
['remote "other"'] ['remote "other"']
@@ -181,7 +181,7 @@ def test_config_list(tmp_dir, dvc, capsys):
out, _ = capsys.readouterr() out, _ = capsys.readouterr()
assert "remote.myremote.url=s3://bucket/path" in out assert "remote.myremote.url=s3://bucket/path" in out
assert "remote.myremote.region=us-east-2" in out assert "remote.myremote.region=us-east-2" in out
assert "remote.myremote.profile=iterative" in out assert "remote.myremote.profile=treeverse" in out
assert "remote.myremote.access_key_id=abcde" in out assert "remote.myremote.access_key_id=abcde" in out
assert "remote.myremote.secret_access_key=123456" in out assert "remote.myremote.secret_access_key=123456" in out
assert "remote.other.url=gs://bucket/path" in out assert "remote.other.url=gs://bucket/path" in out
@@ -242,7 +242,7 @@ def test_merging_two_levels(dvc):
def test_config_loads_without_error_for_non_dvc_repo(tmp_dir): def test_config_loads_without_error_for_non_dvc_repo(tmp_dir):
# regression testing for https://github.com/iterative/dvc/issues/3328 # regression testing for https://github.com/treeverse/dvc/issues/3328
Config.from_cwd(validate=True) Config.from_cwd(validate=True)
+2 -2
View File
@@ -730,12 +730,12 @@ def test_pull_allow_missing(tmp_dir, dvc, local_remote):
def test_pull_granular_excluding_import_that_cannot_be_pulled( def test_pull_granular_excluding_import_that_cannot_be_pulled(
tmp_dir, dvc, local_remote, mocker tmp_dir, dvc, local_remote, mocker
): ):
"""Regression test for https://github.com/iterative/dvc/issues/10309.""" """Regression test for https://github.com/treeverse/dvc/issues/10309."""
mocker.patch("dvc.fs.dvc._DVCFileSystem", side_effect=CloneError("SCM error")) mocker.patch("dvc.fs.dvc._DVCFileSystem", side_effect=CloneError("SCM error"))
(stage,) = tmp_dir.dvc_gen({"dir": {"foo": "foo", "bar": "bar"}}) (stage,) = tmp_dir.dvc_gen({"dir": {"foo": "foo", "bar": "bar"}})
imp_stage = dvc.imp( imp_stage = dvc.imp(
"https://user:[email protected]/iterative/dvc.git", "https://user:[email protected]/treeverse/dvc.git",
"dir", "dir",
out="new_dir", out="new_dir",
rev="HEAD", rev="HEAD",
+2 -2
View File
@@ -578,7 +578,7 @@ def test_root_from_file_to_dir(M, tmp_dir, dvc, scm):
def test_empty_dir(tmp_dir, scm, dvc, M): def test_empty_dir(tmp_dir, scm, dvc, M):
# regression testing for https://github.com/iterative/dvc/issues/8958 # regression testing for https://github.com/treeverse/dvc/issues/8958
tmp_dir.dvc_gen({"data": {"foo": "foo"}}) tmp_dir.dvc_gen({"data": {"foo": "foo"}})
remove("data") remove("data")
@@ -1216,7 +1216,7 @@ def test_renames(
def test_shallow_should_iterate_upto_tracked_directory( def test_shallow_should_iterate_upto_tracked_directory(
M, tmp_dir, dvc, scm, local_remote M, tmp_dir, dvc, scm, local_remote
): ):
"""Testing regression for https://github.com/iterative/dvc/issues/10899.""" """Testing regression for https://github.com/treeverse/dvc/issues/10899."""
tmp_dir.scm_gen({"dir": {".gitkeep": ""}}, commit="mk dir") tmp_dir.scm_gen({"dir": {".gitkeep": ""}}, commit="mk dir")
dataset_root = join("dir", "data", "") dataset_root = join("dir", "data", "")
+1 -1
View File
@@ -101,7 +101,7 @@ def test_pull_subdir_file(tmp_dir, erepo_dir):
def test_relative_remote(erepo_dir, tmp_dir): def test_relative_remote(erepo_dir, tmp_dir):
# these steps reproduce the script on this issue: # these steps reproduce the script on this issue:
# https://github.com/iterative/dvc/issues/2756 # https://github.com/treeverse/dvc/issues/2756
with erepo_dir.chdir(): with erepo_dir.chdir():
erepo_dir.dvc_gen("file", "contents", commit="create file") erepo_dir.dvc_gen("file", "contents", commit="create file")
+1 -1
View File
@@ -160,7 +160,7 @@ def test_non_cached_output(tmp_dir, erepo_dir):
assert (tmp_dir / dst).read_text().strip() == "hello" assert (tmp_dir / dst).read_text().strip() == "hello"
# https://github.com/iterative/dvc/pull/2837#discussion_r352123053 # https://github.com/treeverse/dvc/pull/2837#discussion_r352123053
def test_absolute_file_outside_repo(tmp_dir, erepo_dir): def test_absolute_file_outside_repo(tmp_dir, erepo_dir):
with pytest.raises(FileNotFoundError): with pytest.raises(FileNotFoundError):
Repo.get(os.fspath(erepo_dir), "/root/") Repo.get(os.fspath(erepo_dir), "/root/")
+1 -1
View File
@@ -405,7 +405,7 @@ def test_import_non_existing(erepo_dir, tmp_dir, dvc):
with pytest.raises(FileNotFoundError): with pytest.raises(FileNotFoundError):
tmp_dir.dvc.imp(os.fspath(erepo_dir), "invalid_output") tmp_dir.dvc.imp(os.fspath(erepo_dir), "invalid_output")
# https://github.com/iterative/dvc/pull/2837#discussion_r352123053 # https://github.com/treeverse/dvc/pull/2837#discussion_r352123053
with pytest.raises(FileNotFoundError): with pytest.raises(FileNotFoundError):
tmp_dir.dvc.imp(os.fspath(erepo_dir), "/root/", "root") tmp_dir.dvc.imp(os.fspath(erepo_dir), "/root/", "root")
+1 -1
View File
@@ -109,7 +109,7 @@ def test_gen_dvcignore(tmp_dir):
def test_init_when_ignored_by_git(tmp_dir, scm, caplog): def test_init_when_ignored_by_git(tmp_dir, scm, caplog):
# https://github.com/iterative/dvc/issues/3738 # https://github.com/treeverse/dvc/issues/3738
tmp_dir.gen({".gitignore": ".*"}) tmp_dir.gen({".gitignore": ".*"})
with caplog.at_level(logging.ERROR, logger="dvc"): with caplog.at_level(logging.ERROR, logger="dvc"):
assert main(["init"]) == 1 assert main(["init"]) == 1
+1 -1
View File
@@ -125,7 +125,7 @@ def assert_index_equal(first, second, strict=True, ordered=True):
def test_skip_graph_checks(dvc, mocker): def test_skip_graph_checks(dvc, mocker):
# See https://github.com/iterative/dvc/issues/2671 for more info # See https://github.com/treeverse/dvc/issues/2671 for more info
mock_build_graph = mocker.spy(Index.graph, "fget") mock_build_graph = mocker.spy(Index.graph, "fget")
# sanity check # sanity check
+2 -2
View File
@@ -241,7 +241,7 @@ def test_compose_and_dump_dir_module(
def test_compose_and_dump_yaml_handles_string(tmp_dir): def test_compose_and_dump_yaml_handles_string(tmp_dir):
"""Regression test for https://github.com/iterative/dvc/issues/8583""" """Regression test for https://github.com/treeverse/dvc/issues/8583"""
from dvc.utils.hydra import compose_and_dump from dvc.utils.hydra import compose_and_dump
config = tmp_dir / "conf" / "config.yaml" config = tmp_dir / "conf" / "config.yaml"
@@ -253,7 +253,7 @@ def test_compose_and_dump_yaml_handles_string(tmp_dir):
def test_compose_and_dump_resolves_interpolation(tmp_dir): def test_compose_and_dump_resolves_interpolation(tmp_dir):
"""Regression test for https://github.com/iterative/dvc/issues/9196""" """Regression test for https://github.com/treeverse/dvc/issues/9196"""
from dvc.utils.hydra import compose_and_dump from dvc.utils.hydra import compose_and_dump
config = tmp_dir / "conf" / "config.yaml" config = tmp_dir / "conf" / "config.yaml"
+1 -1
View File
@@ -119,7 +119,7 @@ def test_show_ascii(repo):
def test_show_dot(repo): def test_show_dot(repo):
# dot file rendering is not deterministic though graph # dot file rendering is not deterministic though graph
# output doesn't depend upon order of lines. Use sorted values # output doesn't depend upon order of lines. Use sorted values
# https://github.com/iterative/dvc/pull/7725 # https://github.com/treeverse/dvc/pull/7725
expected = [ expected = [
"\"stage: '1'\";", "\"stage: '1'\";",
"\"stage: '2'\";", "\"stage: '2'\";",
+1 -1
View File
@@ -214,7 +214,7 @@ def test_read_params_py(tmp_dir, dvc):
def test_params_py_tuple_status(tmp_dir, dvc): def test_params_py_tuple_status(tmp_dir, dvc):
"""https://github.com/iterative/dvc/issues/8803""" """https://github.com/treeverse/dvc/issues/8803"""
parameters_file = "parameters.py" parameters_file = "parameters.py"
tmp_dir.gen(parameters_file, "TUPLE = (10, 100)\n") tmp_dir.gen(parameters_file, "TUPLE = (10, 100)\n")
dep = ParamsDependency(Stage(dvc), parameters_file, ["TUPLE"]) dep = ParamsDependency(Stage(dvc), parameters_file, ["TUPLE"])
+1 -1
View File
@@ -42,7 +42,7 @@ def test_save_missing(dvc, mocker):
), # hdfs checksum ), # hdfs checksum
# Not much we can do about hex and oct values without writing our own # Not much we can do about hex and oct values without writing our own
# parser. So listing these test cases just to acknowledge this. # parser. So listing these test cases just to acknowledge this.
# See https://github.com/iterative/dvc/issues/3331. # See https://github.com/treeverse/dvc/issues/3331.
(0x3451, "13393"), (0x3451, "13393"),
(0o1244, "676"), (0o1244, "676"),
], ],
+1 -1
View File
@@ -69,7 +69,7 @@ def session_app(tmp_path_factory) -> FSApp:
"""Session scoped experiments queue celery app.""" """Session scoped experiments queue celery app."""
from kombu.transport.filesystem import Channel from kombu.transport.filesystem import Channel
# related to https://github.com/iterative/dvc-task/issues/61 # related to https://github.com/treeverse/dvc-task/issues/61
Channel.QoS.restore_at_shutdown = False Channel.QoS.restore_at_shutdown = False
from dvc_task.app import FSApp from dvc_task.app import FSApp
+1 -1
View File
@@ -74,7 +74,7 @@ def test_locked(mocker):
def test_skip_graph_checks(tmp_dir, dvc, mocker, run_copy): def test_skip_graph_checks(tmp_dir, dvc, mocker, run_copy):
# See https://github.com/iterative/dvc/issues/2671 for more info # See https://github.com/treeverse/dvc/issues/2671 for more info
from dvc.repo.index import Index from dvc.repo.index import Index
mock_build_graph = mocker.spy(Index.graph, "fget") mock_build_graph = mocker.spy(Index.graph, "fget")
+6 -6
View File
@@ -167,16 +167,16 @@ def test_system_info():
@pytest.mark.parametrize( @pytest.mark.parametrize(
"git_remote", "git_remote",
[ [
"git://github.com/iterative/dvc.git", "git://github.com/treeverse/dvc.git",
"[email protected]:iterative/dvc.git", "[email protected]:treeverse/dvc.git",
"http://github.com/iterative/dvc.git", "http://github.com/treeverse/dvc.git",
"https://github.com/iterative/dvc.git", "https://github.com/treeverse/dvc.git",
"ssh://[email protected]/iterative/dvc.git", "ssh://[email protected]/treeverse/dvc.git",
], ],
) )
def test_git_remote_hash(mocker, git_remote): def test_git_remote_hash(mocker, git_remote):
m = mocker.patch("dvc.analytics._git_remote_url", return_value=git_remote) m = mocker.patch("dvc.analytics._git_remote_url", return_value=git_remote)
expected = hashlib.md5(b"iterative/dvc.git", usedforsecurity=False).hexdigest() expected = hashlib.md5(b"treeverse/dvc.git", usedforsecurity=False).hexdigest()
assert analytics._git_remote_path_hash(None) == expected assert analytics._git_remote_path_hash(None) == expected
m.assert_called_once_with(None) m.assert_called_once_with(None)
+2 -2
View File
@@ -158,14 +158,14 @@ def test_check(mocker, updater):
None, None,
( (
"Find the latest release at " "Find the latest release at "
"https://github.com/iterative/dvc/releases/latest." "https://github.com/treeverse/dvc/releases/latest."
), ),
), ),
( (
"unknown", "unknown",
( (
"Find the latest release at " "Find the latest release at "
"https://github.com/iterative/dvc/releases/latest." "https://github.com/treeverse/dvc/releases/latest."
), ),
), ),
], ],
+2 -2
View File
@@ -46,7 +46,7 @@ def test_notify_refs(mocker, status_code, side_effect):
mock_post = mocker.patch("requests.Session.post", return_value=response) mock_post = mocker.patch("requests.Session.post", return_value=response)
notify_refs( notify_refs(
"[email protected]:iterative/dvc.git", "[email protected]:treeverse/dvc.git",
"TOKEN", "TOKEN",
pushed=["p1", "p2"], pushed=["p1", "p2"],
removed=["r1", "r2"], removed=["r1", "r2"],
@@ -56,7 +56,7 @@ def test_notify_refs(mocker, status_code, side_effect):
assert mock_post.call_args == mocker.call( assert mock_post.call_args == mocker.call(
urljoin(STUDIO_URL, "/webhook/dvc"), urljoin(STUDIO_URL, "/webhook/dvc"),
json={ json={
"repo_url": "[email protected]:iterative/dvc.git", "repo_url": "[email protected]:treeverse/dvc.git",
"client": "dvc", "client": "dvc",
"refs": { "refs": {
"pushed": ["p1", "p2"], "pushed": ["p1", "p2"],