Skip to content

Commit

Permalink
Binary packages rename
Browse files Browse the repository at this point in the history
  • Loading branch information
lasote committed Oct 26, 2017
1 parent b1e4d19 commit 5d879c2
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ Then add that 'conan' file to your PATH and you are ready:
remove Remove any folder from your local/remote store
search show local/remote packages
test build and run your package test. Must have conanfile.py with "test"
upload uploads a conanfile or package binaries from the local store to any remote.
upload uploads a conanfile or binary packages from the local store to any remote.
user shows or change the current user

License
Expand Down
22 changes: 11 additions & 11 deletions conans/client/command.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def new(self, *args):
def test(self, *args):
""" Runs a test_folder/conanfile.py to test an existing package.
The package to be tested must exist in the local cache or any configured remote.
To create and test a package binary for a local directory conanfile.py use the
To create and test a binary package for a local directory conanfile.py use the
'conan create' command.
"""
parser = argparse.ArgumentParser(description=self.test.__doc__, prog="conan test")
Expand Down Expand Up @@ -160,7 +160,7 @@ def test(self, *args):

def test_package(self, *args):
"""DEPRECATED, will be removed. Use 'conan create' and/or 'conan test'.
Use 'conan create' to generate package binaries for a recipe.
Use 'conan create' to generate binary packages for a recipe.
If you want to test a package you can use 'conan test' command.
"""

Expand Down Expand Up @@ -200,7 +200,7 @@ def test_package(self, *args):
version=version)

def create(self, *args):
""" Builds a package binary for recipe (conanfile.py) located in current dir.
""" Builds a binary package for recipe (conanfile.py) located in current dir.
Uses the specified configuration in a profile or in -s settings, -o options etc.
If a 'test_package' folder (the name can be configured with -tf) is found, the command will
run the consumer project to ensure that the package has been created correctly. Check the
Expand Down Expand Up @@ -265,9 +265,9 @@ def install(self, *args):
"""Installs the requirements specified in a conanfile (.py or .txt).
If any requirement is not found in the local cache it will retrieve the recipe from a
remote, looking for it sequentially in the available configured remotes.
When the recipes have been downloaded it will try to download a package binary matching
When the recipes have been downloaded it will try to download a binary package matching
the specified settings, only from the remote from which the recipe was retrieved.
If no package binary is found you can build the package from sources using the '--build'
If no binary package is found you can build the package from sources using the '--build'
option.
When the package is installed, Conan will write the files for the specified generators.
It can also be used to install a concrete recipe/package specifying a reference in the
Expand Down Expand Up @@ -771,7 +771,7 @@ def search(self, *args):
If you provide a pattern, then it will search for existing package recipes matching that pattern.
If a full and complete package reference is provided, like Pkg/0.1@user/channel, then the existing
package binaries for that reference will be displayed.
binary packages for that reference will be displayed.
You can search in a remote or in the local cache, if nothing is specified, the local conan cache is
assumed.
Search is case sensitive, exact case has to be used. For case insensitive file systems, like Windows,
Expand Down Expand Up @@ -827,7 +827,7 @@ def search(self, *args):
self._outputer.print_search_references(refs, args.pattern, args.raw)

def upload(self, *args):
""" Uploads a recipe and package binaries to a remote.
""" Uploads a recipe and binary packages to a remote.
If you use the --force variable, it won't check the package date. It will override
the remote with the local package.
Expand Down Expand Up @@ -1208,10 +1208,10 @@ def _add_common_install_arguments(parser, build_help):

_help_build_policies = '''Optional, use it to choose if you want to build from sources:
--build Build all from sources, do not use package binaries.
--build=never Default option. Never build, use package binaries or fail if a package binary is not found.
--build=missing Build from code if a package binary is not found.
--build=outdated Build from code if the binary is not built with the current recipe or when missing package binary.
--build Build all from sources, do not use binary packages.
--build=never Default option. Never build, use binary packages or fail if a binary package is not found.
--build=missing Build from code if a binary package is not found.
--build=outdated Build from code if the binary is not built with the current recipe or when missing binary package.
--build=[pattern] Build always these packages from source, but never build the others. Allows multiple --build parameters. 'pattern' is a fnmatch file pattern of a package name.
'''

Expand Down
4 changes: 2 additions & 2 deletions conans/client/conan_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def test_package(self, profile_name=None, settings=None, options=None, env=None,
version=None):

self._user_io.out.warn("THIS METHOD IS DEPRECATED and will be removed. "
"Use 'conan create' to generate package binaries for a "
"Use 'conan create' to generate binary packages for a "
"recipe. If you want to test a package you can use 'conan test' "
"command.")

Expand Down Expand Up @@ -715,7 +715,7 @@ def search_packages(self, reference, query=None, remote=None, outdated=False):
@api_method
def upload(self, pattern, package=None, remote=None, all=False, force=False, confirm=False,
retry=2, retry_wait=5, skip_upload=False, integrity_check=False):
""" Uploads a package recipe and the generated package binaries to a specified remote
""" Uploads a package recipe and the generated binary packages to a specified remote
"""
if package and not is_a_reference(pattern):
raise ConanException("-p parameter only allowed with a valid recipe reference, "
Expand Down
6 changes: 3 additions & 3 deletions conans/client/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def build_id(conan_file):


class _ConanPackageBuilder(object):
"""Builds and packages a single conan_file package binary"""
"""Builds and packages a single conan_file binary package"""

def __init__(self, conan_file, package_reference, client_cache, output):
self._client_cache = client_cache
Expand Down Expand Up @@ -264,7 +264,7 @@ def call_package_info(conanfile, package_folder):


class ConanInstaller(object):
""" main responsible of retrieving package binaries or building them from source
""" main responsible of retrieving binary packages or building them from source
locally in case they are not found in remotes
"""
def __init__(self, client_cache, output, remote_proxy, build_mode, build_requires):
Expand Down Expand Up @@ -294,7 +294,7 @@ def _compute_private_nodes(self, deps_graph):
""" computes a list of nodes that are not required to be built, as they are
private requirements of already available shared libraries as binaries.
If the package requiring a private node has an up to date package binary,
If the package requiring a private node has an up to date binary package,
the private node is not retrieved nor built
"""
skip_nodes = set() # Nodes that require private packages but are already built
Expand Down
2 changes: 1 addition & 1 deletion conans/client/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ def download(self, reference, package_ids, remote=None):
packages_props = remote_proxy.search_packages(reference, None)
if not packages_props:
output = ScopedOutput(str(reference), self._user_io.out)
output.warn("No remote package binaries found in remote")
output.warn("No remote binary packages found in remote")
else:
remote_proxy.download_packages(reference, list(packages_props.keys()))

Expand Down
4 changes: 2 additions & 2 deletions conans/test/integration/install_outdated_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def install_outdated_dep_test(self):
# Upload only the recipe, so the package is outdated in the server
self.client.run("upload Hello0/0.1@lasote/stable")

# Now, with the new_client, remove only the package binary from Hello0
# Now, with the new_client, remove only the binary package from Hello0
rmdir(new_client.paths.packages(self.ref))
# And try to install Hello1 again, should not complain because the remote
# binary is in the "same version" than local cached Hello0
Expand Down Expand Up @@ -113,7 +113,7 @@ def install_outdated_and_dep_test(self):
# Upload only the recipe, so the package is outdated in the server
self.client.run("upload Hello0/0.1@lasote/stable")

# Now, with the new_client, remove only the package binary from Hello0
# Now, with the new_client, remove only the binary package from Hello0
rmdir(new_client.paths.packages(self.ref))
# And try to install Hello1 again, should not complain because the remote
# binary is in the "same version" than local cached Hello0
Expand Down
2 changes: 1 addition & 1 deletion conans/test/integration/install_selected_packages_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def install_all_but_no_packages_test(self):

# And try to download all
self.new_client.run("download Hello0/0.1@lasote/stable")
self.assertIn("No remote package binaries found in remote", self.new_client.user_io.out)
self.assertIn("No remote binary packages found in remote", self.new_client.user_io.out)

def _upload_some_packages(self, client):
self.ref = ConanFileReference.loads("Hello0/0.1@lasote/stable")
Expand Down
2 changes: 1 addition & 1 deletion conans/test/integration/install_update_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def package(self):
time.sleep(1)
upload("mycontent2")

# This is no longer necessary, as package binaries are removed when recipe is updated
# This is no longer necessary, as binary packages are removed when recipe is updated
# client.run("remove Pkg/0.1@lasote/channel -p -f")
client.run("install Pkg/0.1@lasote/channel -u --build=missing")
conan_ref = ConanFileReference.loads("Pkg/0.1@lasote/channel")
Expand Down

0 comments on commit 5d879c2

Please sign in to comment.