Skip to content

Commit 10863d2

Browse files
committed
bump scmrepo to 0.0.23
`scmrepo==0.0.23` includes proper support for windows file:// URLs (iterative/scmrepo#68), so Windows tests relying on file URLs had to be fixed in order to be valid [RFC 8089](https://datatracker.ietf.org/doc/html/rfc8089) URLs.
1 parent 3d79177 commit 10863d2

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ install_requires =
6666
typing-extensions>=3.7.4
6767
fsspec[http]>=2021.10.1
6868
aiohttp-retry>=2.4.5
69-
scmrepo==0.0.22
69+
scmrepo==0.0.23
7070
dvc-render==0.0.5
7171
dvclive>=0.7.3
7272
dvc-data==0.0.2

tests/func/test_api.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def test_get_url_external(tmp_dir, erepo_dir, cloud):
2020
erepo_dir.dvc_gen("foo", "foo", commit="add foo")
2121

2222
# Using file url to force clone to tmp repo
23-
repo_url = f"file://{erepo_dir}"
23+
repo_url = f"file://{erepo_dir.as_posix()}"
2424
expected_url = (cloud / "ac/bd18db4cc2f85cedef654fccc4a4d8").url
2525
assert api.get_url("foo", repo=repo_url) == expected_url
2626

@@ -32,7 +32,7 @@ def test_get_url_requires_dvc(tmp_dir, scm):
3232
api.get_url("foo", repo=os.fspath(tmp_dir))
3333

3434
with pytest.raises(OutputNotFoundError, match="output 'foo'"):
35-
api.get_url("foo", repo=f"file://{tmp_dir}")
35+
api.get_url("foo", repo=f"file://{tmp_dir.as_posix()}")
3636

3737

3838
def test_open_external(tmp_dir, erepo_dir, cloud):
@@ -51,7 +51,7 @@ def test_open_external(tmp_dir, erepo_dir, cloud):
5151
remove(erepo_dir.dvc.odb.local.cache_dir)
5252

5353
# Using file url to force clone to tmp repo
54-
repo_url = f"file://{erepo_dir}"
54+
repo_url = f"file://{erepo_dir.as_posix()}"
5555
with api.open("version", repo=repo_url) as fd:
5656
assert fd.read() == "master"
5757

@@ -138,7 +138,7 @@ def test_api_missing_local_cache_exists_on_remote(
138138
remove(dvc.odb.local.cache_dir)
139139
remove(first(files))
140140

141-
repo_url = f"file://{tmp_dir}" if as_external else None
141+
repo_url = f"file://{tmp_dir.as_posix()}" if as_external else None
142142
file_content = get_in(files, to_read.split(os.sep))
143143
assert api.read(to_read, repo=repo_url) == file_content
144144

@@ -154,7 +154,7 @@ def test_read_with_subrepos(tmp_dir, scm, local_cloud, local_repo):
154154
subrepo.dvc_gen("dvc-file", "dvc-file", commit="add dir")
155155
subrepo.dvc.push()
156156

157-
repo_path = None if local_repo else f"file://{tmp_dir}"
157+
repo_path = None if local_repo else f"file://{tmp_dir.as_posix()}"
158158
subrepo_path = os.path.join("dir", "subrepo")
159159

160160
assert api.read("foo.txt", repo=repo_path) == "foo.txt"
@@ -223,6 +223,8 @@ def test_open_from_remote(tmp_dir, erepo_dir, cloud, local_cloud):
223223
remove(erepo_dir.dvc.odb.local.cache_dir)
224224

225225
with api.open(
226-
os.path.join("dir", "foo"), repo=f"file://{erepo_dir}", remote="other"
226+
os.path.join("dir", "foo"),
227+
repo=f"file://{erepo_dir.as_posix()}",
228+
remote="other",
227229
) as fd:
228230
assert fd.read() == "foo content"

tests/func/test_external_repo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def test_cache_reused(erepo_dir, mocker, local_cloud):
5757
download_spy = mocker.spy(generic, "transfer")
5858

5959
# Use URL to prevent any fishy optimizations
60-
url = f"file://{erepo_dir}"
60+
url = f"file://{erepo_dir.as_posix()}"
6161
with external_repo(url) as repo:
6262
repo.fetch()
6363
assert download_spy.mock.call_count == 1
@@ -72,7 +72,7 @@ def test_cache_reused(erepo_dir, mocker, local_cloud):
7272
def test_known_sha(erepo_dir):
7373
erepo_dir.scm.commit("init")
7474

75-
url = f"file://{erepo_dir}"
75+
url = f"file://{erepo_dir.as_posix()}"
7676
with external_repo(url) as repo:
7777
rev = repo.scm.get_rev()
7878
prev_rev = repo.scm.resolve_rev("HEAD^")

tests/func/test_get.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ def test_get_pipeline_tracked_outs(
266266
dvc.scm.commit("add pipeline stage")
267267

268268
with git_dir.chdir():
269-
Repo.get(f"file://{os.fspath(tmp_dir)}", "bar", out="baz")
269+
Repo.get(f"file://{tmp_dir.as_posix()}", "bar", out="baz")
270270
assert (git_dir / "baz").read_text() == "foo"
271271

272272

tests/func/test_import.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ def test_import_pipeline_tracked_outs(
408408
dvc.scm.commit("add pipeline stage")
409409

410410
with erepo_dir.chdir():
411-
erepo_dir.dvc.imp(f"file://{os.fspath(tmp_dir)}", "bar", out="baz")
411+
erepo_dir.dvc.imp(f"file://{tmp_dir.as_posix()}", "bar", out="baz")
412412
assert (erepo_dir / "baz").read_text() == "foo"
413413

414414

tests/func/test_ls.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ def test_ls_remote_repo(erepo_dir):
319319
erepo_dir.scm_gen(FS_STRUCTURE, commit="init")
320320
erepo_dir.dvc_gen(DVC_STRUCTURE, commit="dvc")
321321

322-
url = f"file://{erepo_dir}"
322+
url = f"file://{erepo_dir.as_posix()}"
323323
files = Repo.ls(url)
324324
match_files(
325325
files,
@@ -340,7 +340,7 @@ def test_ls_remote_repo_recursive(erepo_dir):
340340
erepo_dir.scm_gen(FS_STRUCTURE, commit="init")
341341
erepo_dir.dvc_gen(DVC_STRUCTURE, commit="dvc")
342342

343-
url = f"file://{erepo_dir}"
343+
url = f"file://{erepo_dir.as_posix()}"
344344
files = Repo.ls(url, recursive=True)
345345
match_files(
346346
files,
@@ -369,7 +369,7 @@ def test_ls_remote_git_only_repo_recursive(git_dir):
369369
with git_dir.chdir():
370370
git_dir.scm_gen(FS_STRUCTURE, commit="init")
371371

372-
url = f"file://{git_dir}"
372+
url = f"file://{git_dir.as_posix()}"
373373
files = Repo.ls(url, recursive=True)
374374
match_files(
375375
files,
@@ -387,7 +387,7 @@ def test_ls_remote_repo_with_path_dir(erepo_dir):
387387
erepo_dir.scm_gen(FS_STRUCTURE, commit="init")
388388
erepo_dir.dvc_gen(DVC_STRUCTURE, commit="dvc")
389389

390-
url = f"file://{erepo_dir}"
390+
url = f"file://{erepo_dir.as_posix()}"
391391
path = "model"
392392
files = Repo.ls(url, path)
393393
match_files(
@@ -408,7 +408,7 @@ def test_ls_remote_repo_with_rev(erepo_dir):
408408
erepo_dir.dvc_gen(DVC_STRUCTURE, commit="dvc")
409409

410410
rev = erepo_dir.scm.list_all_commits()[1]
411-
url = f"file://{erepo_dir}"
411+
url = f"file://{erepo_dir.as_posix()}"
412412
files = Repo.ls(url, rev=rev)
413413
match_files(
414414
files,
@@ -427,7 +427,7 @@ def test_ls_remote_repo_with_rev_recursive(erepo_dir):
427427
erepo_dir.scm_gen(FS_STRUCTURE, commit="init")
428428

429429
rev = erepo_dir.scm.list_all_commits()[1]
430-
url = f"file://{erepo_dir}"
430+
url = f"file://{erepo_dir.as_posix()}"
431431
files = Repo.ls(url, rev=rev, recursive=True)
432432
match_files(
433433
files,

tests/func/utils/test_strict_yaml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ def test_on_revision(
394394
tmp_dir.scm_gen("dvc.yaml", text, commit="add dvc.yaml")
395395
capsys.readouterr() # clear outputs
396396

397-
assert main(["ls", f"file://{tmp_dir}", "--rev", "HEAD"]) != 0
397+
assert main(["ls", f"file://{tmp_dir.as_posix()}", "--rev", "HEAD"]) != 0
398398

399399
out, err = capsys.readouterr()
400400
assert not out

0 commit comments

Comments
 (0)