Skip to content

Commit 710cd26

Browse files
committed
upload-urls json field
1 parent fc102e5 commit 710cd26

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

conan/internal/api/upload.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ def add_urls(package_list, remote):
66
router = ClientV2Router(remote.url.rstrip("/"))
77
for ref, bundle in package_list.refs().items():
88
for f, fp in bundle.get("files", {}).items():
9-
bundle.setdefault("urls", {})[f] = {
9+
bundle.setdefault("upload-urls", {})[f] = {
1010
'url': router.recipe_file(ref, f), 'checksum': sha1sum(fp)
1111
}
1212
for pref, prev_bundle in package_list.prefs(ref, bundle).items():
1313
for f, fp in prev_bundle.get("files", {}).items():
14-
prev_bundle.setdefault("urls", {})[f] = {
14+
prev_bundle.setdefault("upload-urls", {})[f] = {
1515
'url': router.package_file(pref, f), 'checksum': sha1sum(fp)
1616
}

test/integration/command/upload/upload_test.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ def test_upload_json_output():
544544
pkg = revs["packages"]["9e0f8140f0fe6b967392f8d5da9881e232e05ff8"]
545545
prev = pkg["revisions"]["f50f552c6e04b1f241e5f7864bc3957f"]
546546
assert pkg["info"] == {"settings": {"os": "Linux"}, "options": {"shared": "False"}}
547-
assert revs["urls"] == {
547+
assert revs["upload-urls"] == {
548548
"conanfile.py": {
549549
"url": f"{c.servers['default']}/v2/conans/liba/0.1/_/_/revisions/a565bd5defd3a99e157698fcc6e23b25/files/conanfile.py",
550550
"checksum": sha1sum(revs["files"]["conanfile.py"])
@@ -554,7 +554,7 @@ def test_upload_json_output():
554554
"checksum": sha1sum(revs["files"]["conanmanifest.txt"])
555555
}
556556
}
557-
assert prev["urls"] == {
557+
assert prev["upload-urls"] == {
558558
"conan_package.tgz": {
559559
"url": f"{c.servers['default']}/v2/conans/liba/0.1/_/_/revisions/a565bd5defd3a99e157698fcc6e23b25/packages/9e0f8140f0fe6b967392f8d5da9881e232e05ff8/revisions/f50f552c6e04b1f241e5f7864bc3957f/files/conan_package.tgz",
560560
"checksum": sha1sum(prev["files"]["conan_package.tgz"])
@@ -581,7 +581,7 @@ def test_upload_dry_run_json_output():
581581
pkg = revs["packages"]["9e0f8140f0fe6b967392f8d5da9881e232e05ff8"]
582582
prev = pkg["revisions"]["f50f552c6e04b1f241e5f7864bc3957f"]
583583
assert pkg["info"] == {"settings": {"os": "Linux"}, "options": {"shared": "False"}}
584-
assert revs["urls"] == {
584+
assert revs["upload-urls"] == {
585585
"conanfile.py": {
586586
"url": f"{c.servers['default']}/v2/conans/liba/0.1/_/_/revisions/a565bd5defd3a99e157698fcc6e23b25/files/conanfile.py",
587587
"checksum": sha1sum(revs["files"]["conanfile.py"])
@@ -591,7 +591,7 @@ def test_upload_dry_run_json_output():
591591
"checksum": sha1sum(revs["files"]["conanmanifest.txt"])
592592
}
593593
}
594-
assert prev["urls"] == {
594+
assert prev["upload-urls"] == {
595595
"conan_package.tgz": {
596596
"url": f"{c.servers['default']}/v2/conans/liba/0.1/_/_/revisions/a565bd5defd3a99e157698fcc6e23b25/packages/9e0f8140f0fe6b967392f8d5da9881e232e05ff8/revisions/f50f552c6e04b1f241e5f7864bc3957f/files/conan_package.tgz",
597597
"checksum": sha1sum(prev["files"]["conan_package.tgz"])

0 commit comments

Comments
 (0)