repo: drop _AptCache and add migrate to install_stage_packages() #3030
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
This does remove the broken dependency handling... I need
a working test case to make sure that's solid.
- Move repo.get_pkg_name_parts to test_base, even though it's
in __init__.
- Remove all instance methods from repo and Ubuntu, consolidating
to install_stage_packages() classmethod.
- Move non-class methods in Repo into Repo class so they can be
easily inherited.
- Remove custom _AptCache implementation.
- Use a single instance of the system's apt cache, which should
improve performance due to the penalty of recreating caches in
numerous points. It also simplifies usage without the requirement
of copying/sharing instances for what is (now) a system-wide
resource.
- Remove old scheme for gathering stage packages, and simply do a scan
ourselves for the packages and their dependencies. Then fetch them
using python-apt's fetch_binary().
- Rework apt tests.
- Rework of the ROS plugins to remove their current usage of Ubuntu
and replace it with install_stage_packages().
Signed-off-by: Chris Patterson <chris.patterson@canonical.com>
sergiusens
reviewed
Apr 11, 2020
| # TODO: rename with migration strategy. | ||
| repo_dir = path.join(self._project.parts_dir, part_name, "ubuntu") | ||
| stage_packages_repo = repo.Repo(repo_dir) | ||
| stage_packages_repo = repo.Repo |
There was a problem hiding this comment.
repo_dir is used in PluginHandler, so you might need to adapt some tests or actual code.
|
|
||
| @classmethod |
There was a problem hiding this comment.
maybe
Suggested change
| @classmethod | |
| @staticmethod |
and drop cls
| elif os.path.exists(path): | ||
| _fix_filemode(path) | ||
|
|
||
| if path.endswith(".pc") and not os.path.islink(path): | ||
| fix_pkg_config(unpackdir, path) | ||
|
|
||
| def _fix_xml_tools(self, unpackdir: str) -> None: | ||
| @classmethod |
| @@ -293,9 +267,10 @@ def _fix_xml_tools(self, unpackdir: str) -> None: | |||
| "prefix={}/usr".format(unpackdir), | |||
| ) | |||
|
|
|||
| def _fix_symlink(self, path: str, unpackdir: str, root: str) -> None: | |||
| @classmethod | |||
| @@ -307,7 +282,8 @@ def _fix_symlink(self, path: str, unpackdir: str, root: str) -> None: | |||
| os.remove(path) | |||
| os.symlink(os.path.relpath(target, root), path) | |||
|
|
|||
| def _fix_shebangs(self, unpackdir: str) -> None: | |||
| @classmethod | |||
sergiusens
reviewed
Apr 13, 2020
| @@ -517,10 +517,6 @@ def clean_pull(self): | |||
| if self.is_clean(steps.PULL): | |||
| return | |||
|
|
|||
| # Remove stage-packages cache (where stage packages are fetched) | |||
There was a problem hiding this comment.
Does this mean that if you remove a stage-packages entry from a list that would remove the need to bring set packages in that those packages would still be staged?
There was a problem hiding this comment.
the cache directory is common for everything now (~/.cache/snapcraft/download). install_stage_packages() is the one that extracts the list of packages. So assuming the part was cleaned (that is, pluginhandler detects the change in stage-packages and rebuilds), that stage package is never extracted.
cjp256
changed the title
sergiusens
reviewed
Apr 13, 2020
| @@ -543,7 +534,7 @@ def prepare_build(self, force=False): | |||
| self.makedirs() | |||
| # Stage packages are fetched and unpacked in the pull step, but we'll | |||
| # unpack again here just in case the build step has been cleaned. | |||
| self._unpack_stage_packages() | |||
| self._install_stage_packages() | |||
There was a problem hiding this comment.
This might not be needed anymore for v2... we need to cleanup snapcraft.internal.lifecycle._runner when we have time.
sergiusens
approved these changes
Apr 13, 2020
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.
This does remove the broken dependency handling... I need
a working test case to make sure that's solid.
Move repo.get_pkg_name_parts to test_base, even though it's
in init.
Remove all instance methods from repo and Ubuntu, consolidating
to install_stage_packages() classmethod.
Move non-class methods in Repo into Repo class so they can be
easily inherited.
Remove custom _AptCache implementation.
Use a single instance of the system's apt cache, which should
improve performance due to the penalty of recreating caches in
numerous points. It also simplifies usage without the requirement
of copying/sharing instances for what is (now) a system-wide
resource.
Remove old scheme for gathering stage packages, and simply do a scan
ourselves for the packages and their dependencies. Then fetch them
using python-apt's fetch_binary().
Rework apt tests.
Rework of the ROS plugins to remove their current usage of Ubuntu
and replace it with install_stage_packages().
Signed-off-by: Chris Patterson chris.patterson@canonical.com
./runtests.sh static?./runtests.sh tests/unit?