- Notifications
You must be signed in to change notification settings - Fork5.6k
Merge 3007.x forward into master#68562
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
dwoz wants to merge94 commits intosaltstack:masterChoose a base branch
base:master
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Open
+3,258 −601,767
Conversation
This file contains hidden or 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
- Deduplicates binary or text detection in utils.files.is_text and utils.stringutils.is_binary- Updates utils.files.is_text and utils.files.is_binary to use the utils.stringutils.is_binary to do the text or binary identification.
- Define `text_characters` only when it will be used- Adds commentaries about the `text_characters` definition- Fix a corner case if a utf-8 multibyte character is truncated and more than 30% of the byte array have values between 1 and 31.
fixessaltstack#31427fixessaltstack#39875 (previous solution was incomplete)Trying to convert the list and sub-objects into a set caused variousissues when checking for existance. Use a proper loop and `in` checks toprovide a more correct behavior.
Fixes the salt logging implementation to check asyncio is using theSaltLoggingClass if it has already been imported. If it uses thestandard logging.Logger() class then extra fields in the log format suchas %(jid)s will cause an exception when asyncio logs anything.
These man pages are still generated and packaged with every release.
Add rpmsign installation step to the build-rpm-packages job to fixpackage signing failures. This is a temporary fix until the containerimage is updated to include rpmsign by default.
…2-17Merge forward 3006.x into 3007.x
Fix 66568: Prevent unclosed TCP channels and avoid additional errors
Add rpmsign installation step to the build-rpm-packages job to fixpackage signing failures. This is a temporary fix until the containerimage is updated to include rpmsign by default.
…2-18Merge forward 3006.x into 3007.x
Sign up for freeto 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.
Merge Forward Summary: 3007.x → master (2025-12-18)
Files Resolved
requirements/base.txt - Merged dependencies; kept master's Python 3.13 versions + added 3007.x deps (contextvars, immutables, cryptography, jaraco.*, timelib); updated urllib3 to 2.6.2
salt/modules/aptpkg.py - Added fallback SourceEntry/SourcesList classes for when python3-apt unavailable (enables signed-by support); added required imports (tempfile, HAS_APT, etc.)
salt/utils/thin.py - Added backports import with Python 3.13+ compatibility (None fallback)
tests/pytests/pkg/upgrade/test_salt_upgrade.py - Removed salt_master dependency, added debian_disable_policy_rcd fixture for realistic testing, simplified upgrade logic
Theme: Python 3.13 compatibility + better Debian package handling from 3007.x