Merge 7.5 hotfixes #4311
Merged
Merge 7.5 hotfixes #4311
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
Version 1.1.3 fixes the issue with package-repositories that declare architectures. In addition to addressing the wrong parameter order, the new version also improves the handling of architectures. The summary of the change is: if the host system is amd64 and the arch of the package repository is i386, _or_ if the host is arm64 and the repo armhf, then `dpkg --add-architecture <repo_arch>` will be called. Otherwise, the command is not called. This lets us preserve the behavior of enabling i386 in the official repositories when a repo using i386 is added, with the improvement of _not breaking_ apt update when an "incompatible" architecture combination is declared. The new spread tests reflect this. Both run in amd64 and add the deadsnakes ppa to fetch Python in a foreign arch: - For i386, only the deadsnakes ppa is necessary, as the architecture will be added "globally" and Python's dependencies are found in the default archives; - For armhf, the ports.ubuntu.com repo is necessary in addition to the deadsnakes one. This lets the dependencies be found in the ports repo, _and_ doesn't break the build (this combination is broken in Snapcraft 7.2, 7.3 and 7.4). Fixes #4289 and #4298
Move to PyYaml 6.0.1 and constrain to cython < 0 to avoid yaml/pyyaml#601 Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
As sources are re-packed, references are broken. Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
tigarmo
approved these changes
Aug 7, 2023
sergiusens
force-pushed
the
work/hotfix-merge
branch
from
ecf6515
to
aa87a42
Compare
Codecov Report
❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more. @@ Coverage Diff @@
## main #4311 +/- ##
=======================================
Coverage 89.08% 89.08%
=======================================
Files 300 300
Lines 20571 20571
=======================================
Hits 18325 18325
Misses 2246 2246 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
sergiusens
force-pushed
the
work/hotfix-merge
branch
from
aa87a42
to
82f29a9
Compare
mr-cal
approved these changes
Aug 7, 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.
make lint?pytest tests/unit?