Implemented --query flag in conan upload (#2445)
#3377
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
You can now use the --query flag in the `conan upload` command like you would in `conan remove`. In other words, you can use a query to specify which packages will be uploaded to the server.
ghost
added
the
memsharded
reviewed
Aug 20, 2018
conans/client/conan_api.py
Outdated
| @@ -728,8 +728,9 @@ def search_packages(self, reference, query=None, remote_name=None, outdated=Fals | |||
| return recorder.get_info() | |||
|
|
|||
| @api_method | |||
| def upload(self, pattern, package=None, remote_name=None, all_packages=False, force=False, | |||
| confirm=False, retry=2, retry_wait=5, skip_upload=False, integrity_check=False, | |||
| def upload(self, pattern, package=None, query=None, remote_name=None, | |||
There was a problem hiding this comment.
I would say add the new argument in the last position, less likely to break to users of the API
|
Would be happy to take a look at creating tests, will do this asap. :) |
memsharded
approved these changes
Aug 20, 2018
lasote
reviewed
Aug 21, 2018
conans/test/command/upload_test.py
Outdated
| @@ -123,13 +167,14 @@ def gzopen_patched(name, mode="r", fileobj=None, compresslevel=None, **kwargs): | |||
| self.assertIn("ERROR: Error gzopen conan_package.tgz", client.out) | |||
|
|
|||
| export_folder = client.client_cache.package(package_ref) | |||
| print(export_folder) | |||
danimtb
reviewed
Aug 21, 2018
conans/client/command.py
Outdated
| _PATTERN_OR_REFERENCE_HELP = ("Pattern or package recipe reference, e.g., 'boost/*', " | ||
| "'MyPackage/1.2@user/channel'") | ||
| _PATTERN_OR_REFERENCE_HELP = ("Pattern or package recipe reference, e.g., '{}', " | ||
| "'{}'".format(_REFERENCE_EXAMPLE, _PATTERN_EXAMPLE)) |
There was a problem hiding this comment.
I'd rather use %s to format the string to be consistent with Conan codebase
danimtb
reviewed
Aug 21, 2018
conans/client/command.py
Outdated
| _QUERY_HELP = ("Packages query: 'os=Windows AND (arch=x86 OR compiler=gcc)'. The " | ||
| "'pattern_or_reference' parameter has to be a reference: MyPackage/1.2@user/channel") | ||
| _QUERY_HELP = ("Packages query: '{}'. The 'pattern_or_reference' parameter has " | ||
| "to be a reference: {}".format(_QUERY_EXAMPLE, _REFERENCE_EXAMPLE)) |
* .format replaced with old-style Python 2 formatting for consistency. * Removed extraneous print statement.
|
Removed extraneous print statement and removed new-style formatting for consistency. :) |
lasote
approved these changes
Aug 21, 2018
|
Made changes in conan-io/docs for the new option -- see: conan-io/docs#772 |
|
Merged! Will be in conan 1.7. Thanks again for your contribution :) |
|
Awesome, and no problem :D |
3 tasks
grisumbras
pushed a commit
to grisumbras/conan
that referenced
this pull request
Dec 27, 2018
…3377) * Implemented --query flag in `conan upload` (conan-io#2445) You can now use the --query flag in the `conan upload` command like you would in `conan remove`. In other words, you can use a query to specify which packages will be uploaded to the server. * Moved query to final argument to prevent breakage for API users * Added tests for `conan upload --query` * Made changes from code review. * .format replaced with old-style Python 2 formatting for consistency. * Removed extraneous print statement.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
You can now use the --query flag in the
conan uploadcommand like youwould in
conan remove. In other words, you can use a query to specifywhich packages will be uploaded to the server.
Will update documentation tonight.
developbranch, documenting this one. Also adding a description of the changes in thechangelog.rstfile. https://github.com/conan-io/docs