Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow python_requires download for upload command #14511

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conan/api/subapi/upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ class UploadAPI:
def __init__(self, conan_api):
self.conan_api = conan_api

def check_upstream(self, package_list, remote, force=False):
def check_upstream(self, package_list, remote, enabled_remotes, force=False):
"""Check if the artifacts are already in the specified remote, skipping them from
the package_list in that case"""
app = ConanApp(self.conan_api.cache_folder)
for ref, bundle in package_list.refs().items():
layout = app.cache.recipe_layout(ref)
conanfile_path = layout.conanfile()
conanfile = app.loader.load_basic(conanfile_path)
conanfile = app.loader.load_basic(conanfile_path, remotes=enabled_remotes)
if conanfile.upload_policy == "skip":
ConanOutput().info(f"{ref}: Skipping upload of binaries, "
"because upload_policy='skip'")
Expand Down
2 changes: 1 addition & 1 deletion conan/cli/commands/upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def upload(conan_api: ConanAPI, parser, *args):
if args.check:
conan_api.cache.check_integrity(package_list)
# Check if the recipes/packages are in the remote
conan_api.upload.check_upstream(package_list, remote, args.force)
conan_api.upload.check_upstream(package_list, remote, enabled_remotes, args.force)

# If only if search with "*" we ask for confirmation
if not args.list and not args.confirm and "*" in args.pattern:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def upload_bundle(conan_api, parser, *args, **kwargs):
raise ConanException("No recipes found matching pattern '{}'".format(args.reference))

# Check if the recipes/packages are in the remote
conan_api.upload.check_upstream(package_list, remote)
conan_api.upload.check_upstream(package_list, remote, enabled_remotes)
conan_api.upload.prepare(package_list, enabled_remotes)
cli_out_write(json.dumps(package_list.serialize(), indent=4))
""")
Expand Down
14 changes: 14 additions & 0 deletions conans/test/integration/command/upload/upload_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -513,3 +513,17 @@ def test_upload_only_without_user_channel():
c.run("search * -r=default")
assert "lib/1.0@user/channel" in c.out
assert "lib/1.0" in c.out


def test_upload_with_python_requires():
# https://github.com/conan-io/conan/issues/14503
c = TestClient(default_server_user=True)
c.save({"tool/conanfile.py": GenConanfile("tool", "0.1"),
"dep/conanfile.py": GenConanfile("dep", "0.1").with_python_requires("tool/[>=0.1]")})
c.run("create tool")
c.run("create dep")
c.run("upload tool* -c -r=default")
c.run("remove tool* -c")
c.run("upload dep* -c -r=default")
# This used to fail, but adding the enabled remotes to python_requires resolution, it works
assert "tool/0.1: Downloaded recipe" in c.out