Feature/metadata2 #14152
Merged
Feature/metadata2 #14152
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
memsharded
commented
Jun 23, 2023
conan/api/subapi/download.py
Outdated
| @@ -62,5 +62,5 @@ def package(self, pref: PkgReference, remote: Remote, metadata=None): | |||
| conan_file_path = layout.conanfile() | |||
| conanfile = app.loader.load_basic(conan_file_path, display=pref.ref) | |||
| output.info(f"Downloading package '{pref.repr_notime()}'") | |||
| app.remote_manager.get_package(conanfile, pref, remote) | |||
| app.remote_manager.get_package(conanfile, pref, remote, metadata) | |||
There was a problem hiding this comment.
this was a bug, forgetting to pass the argument resulted in metadata not downloaded.
| @@ -39,7 +39,9 @@ def cmd_export(app, conanfile_path, name, version, user, channel, graph_lock=Non | |||
| # TODO: cache2.0 move this creation to other place | |||
| mkdir(export_folder) | |||
| mkdir(export_src_folder) | |||
| conanfile.folders.set_base_recipe_metadata(recipe_layout.metadata()) | |||
| recipe_metadata = recipe_layout.metadata() | |||
| mkdir(recipe_metadata) | |||
There was a problem hiding this comment.
Automatic creation of the folder, so conan cache path --folder=metadata has an existing folder to copy things to.
| def download(self, url, file_path, auth, verify_ssl, retry, retry_wait): | ||
| if not self._download_cache: | ||
| def download(self, url, file_path, auth, verify_ssl, retry, retry_wait, metadata=False): | ||
| if not self._download_cache or metadata: # Metadata not cached and can be overwritten |
There was a problem hiding this comment.
The metadata cannot be cached, as it is not immutable, and not controlled by checksum
| assert os.path.isdir(pkg_folder), "Pkg '%s' folder must exist: %s" % (str(pref), pkg_folder) | ||
| for n in package.nodes: | ||
| n.prev = pref.revision # Make sure the prev is assigned | ||
| conanfile = n.conanfile | ||
| # Call the info method | ||
| conanfile.folders.set_base_package(pkg_folder) | ||
| conanfile.folders.set_base_pkg_metadata(pkg_metadata) |
There was a problem hiding this comment.
This allows deployers to access dep.package_metadata_folder to collect and deploy metadata.
| urls = {fn: self.router.recipe_file(ref, fn) for fn in files} | ||
| self._download_and_save_files(urls, dest_folder, files, parallel=True) | ||
| result.update({fn: os.path.join(dest_folder, fn) for fn in files}) | ||
| if metadata: |
There was a problem hiding this comment.
We need to separate the download to define metadata=True that allows 1) not caching and 2) allows overwriting existing files
| @@ -278,8 +278,8 @@ def recipe_metadata_folder(self): | |||
| return self.folders.recipe_metadata_folder | |||
|
|
|||
| @property | |||
| def pkg_metadata_folder(self): | |||
| return self.folders.pkg_metadata_folder | |||
| def package_metadata_folder(self): | |||
There was a problem hiding this comment.
Just a rename, to not use the pkg short version, everything else UI in Conan is package.
This was referenced Jun 25, 2023
memsharded
requested review from
AbrilRBS and
franramirez688
and removed request for
AbrilRBS
AbrilRBS
approved these changes
Jul 12, 2023
czoido
approved these changes
Jul 12, 2023
1 task
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.
Changelog: Feature: Metadata improvements.
Docs: Omit
download_cache(as it is not checksum, nor revision controlled, and it is mutable)pkg_metadata_folder=>package_metadata_folderConanFileInterfacefor deployers accessClose #4689
Close #4564