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.

Sign up for GitHub

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

Jump to bottom

chore(merge): 7.5.7 into main #5103

Merged
merged 9 commits into from
Oct 10, 2024
Merged

chore(merge): 7.5.7 into main #5103

merged 9 commits into from
Oct 10, 2024

Conversation

mr-cal
Copy link
Collaborator

@mr-cal mr-cal commented Oct 8, 2024

  • Have you followed the guidelines for contributing?
  • Have you signed the CLA?
  • Have you successfully run tox run -m lint?
  • Have you successfully run tox run -e test-py310? (supported versions: py39, py310, py311, py312)

Merge 7.5.7 into main.

This is a no-op merge because identical changes have been made on hotfix/8.4 or fix tests that no longer exist in main.

lengau and others added 9 commits October 3, 2024 15:11
@lengau @mr-cal
build(deps): switch to requests-unixsocket2
b6ce710
@lengau @mr-cal
build(deps): update dependencies
0769811
@lengau @mr-cal
build(deps): update requests for security issue
8fec6ca
@lengau @mr-cal
build(deps): update pylxd
e9f4882
@mr-cal
tests: pin deps in electron-builder test
bf9a203 
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
@lengau @mr-cal
fix(tests/legacy): don't send bad data
702ed0b
@mr-cal
refactor: rename snap_name
1a89a70 
Rename legacy variables to match snapd's definition:
snap_name->snap_instance_name (possibly aliased)
snap_store_name->snap_name (unaliased)

Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
@mr-cal
fix(snapcraft_legacy): get assertions for aliased snaps
119b92a 
Signed-off-by: Callahan Kovacs <callahan.kovacs@canonical.com>
@mr-cal
chore(merge): 7.5.7 into merge/7.5.7
92decac
@mr-cal mr-cal added the merge label Oct 8, 2024
lengau
lengau approved these changes Oct 8, 2024
View reviewed changes
Copy link
Contributor

@lengau lengau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we have a changelog item for 7.5.7?

@mr-cal
Copy link
Collaborator Author

mr-cal commented Oct 8, 2024

Shouldn't we have a changelog item for 7.5.7?

Good question, I added it here so it will show up in the stable version of readthedocs.

I want to talk about release notes and oneflow during the sprint as this is an unintuitive thing to do.

@mr-cal mr-cal requested a review from a team October 8, 2024 17:10
@mr-cal mr-cal merged commit fa644b4 into main Oct 10, 2024
12 of 13 checks passed
@mr-cal mr-cal deleted the merge/7.5.7 branch October 10, 2024 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattculler mattculler mattculler approved these changes

@lengau lengau lengau approved these changes

Assignees
No one assigned
Labels
merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mr-cal @lengau @mattculler