Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 7.5 hotfixes #4311

Merged
merged 4 commits into from
Aug 7, 2023
Merged

Merge 7.5 hotfixes #4311

merged 4 commits into from
Aug 7, 2023

Conversation

sergiusens
Copy link
Collaborator

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?
  • Have you successfully run make lint?
  • Have you successfully run pytest tests/unit?

tigarmo and others added 3 commits August 4, 2023 17:43
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>
@sergiusens sergiusens changed the title Work/hotfix merge Merge 7.5 hotfixes Aug 7, 2023
@codecov-commenter
Copy link

codecov-commenter commented Aug 7, 2023

Codecov Report

Merging #4311 (82f29a9) into main (f3ee96a) will not change coverage.
The diff coverage is n/a.

❗ 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 sergiusens merged commit 9a681aa into main Aug 7, 2023
11 checks passed
@mr-cal mr-cal deleted the work/hotfix-merge branch April 25, 2024 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants