grains: Use platform.freedesktop_os_release#61589
Merged
Ch3LL merged 6 commits intosaltstack:masterfrom Sep 30, 2022
Merged
Conversation
bdrung
force-pushed
the
use_freedesktop_os_release
branch
from
c6e3bfc to
178b8a8
Compare
bdrung
force-pushed
the
use_freedesktop_os_release
branch
3 times, most recently
from
b58c854 to
3b2c5e5
Compare
bdrung
changed the title
Contributor
Author
|
Updated the code so that |
bdrung
force-pushed
the
use_freedesktop_os_release
branch
8 times, most recently
from
3fe0c4b to
a78395c
Compare
bdrung
force-pushed
the
use_freedesktop_os_release
branch
from
a78395c to
76c247e
Compare
bdrung
force-pushed
the
use_freedesktop_os_release
branch
from
76c247e to
fa7775a
Compare
bdrung
force-pushed
the
use_freedesktop_os_release
branch
from
fa7775a to
f9932ba
Compare
bdrung
force-pushed
the
use_freedesktop_os_release
branch
from
f9932ba to
428aa39
Compare
dmurphy18
reviewed
Sep 27, 2022
Contributor
dmurphy18
left a comment
dmurphy18
left a comment
There was a problem hiding this comment.
Looks good, need to get all tests passing, updated against branch and hopefully Windows VM and Apple VM will behave
Ready to approve once all the tests pass
dmurphy18
suggested changes
Sep 27, 2022
Contributor
dmurphy18
left a comment
dmurphy18
left a comment
There was a problem hiding this comment.
Need to address Windows issues, no /etc/os-release on Windows
Restarted MacOS test, but nest check not same issue as on Windows
bdrung
force-pushed
the
use_freedesktop_os_release
branch
from
c9cca87 to
7ab5d4b
Compare
Contributor
Author
|
|
Change `_parse_os_release` to behave nearly identical to
`platform.freedesktop_os_release` from Python >= 3.10, if called with
("/etc/os-release", "/usr/lib/os-release").
There are no os-release files for Pop!_OS and therefore the test cases
would fail with an `OSError` now.
Signed-off-by: Benjamin Drung <benjamin.drung@ionos.com>
Python 3.10 introduced `platform.freedesktop_os_release` which does the
same as `_parse_os_release("/etc/os-release", "/usr/lib/os-release")`.
The parsing of the os-release files is nearly identical and differs only
slightly in the used regular expressions. In contrast to
`_parse_os_release`, `platform.freedesktop_os_release` caches the result
of the parsed os-release file.
Use `platform.freedesktop_os_release` when available. When salt drops
the support for Python < 3.10 (some time in the distant future),
`_parse_os_release` can be removed.
Signed-off-by: Benjamin Drung <benjamin.drung@ionos.com>
Update the OS grains test cases to use `/etc/os-release` data from still supported Debian/Ubuntu releases. Signed-off-by: Benjamin Drung <benjamin.drung@ionos.com>
Signed-off-by: Benjamin Drung <benjamin.drung@ionos.com>
Update the OS grains test cases to use `/etc/os-release` data from the latest Rocky Linux release. Data is taken from Docker image `rockylinux:8`. Signed-off-by: Benjamin Drung <benjamin.drung@ionos.com>
Update the OS grains test cases to use `/etc/os-release` data from the latest AlmaLinux release. Data is taken from docker image `almalinux:8`. Signed-off-by: Benjamin Drung <benjamin.drung@ionos.com>
bdrung
force-pushed
the
use_freedesktop_os_release
branch
from
7ab5d4b to
13a5f11
Compare
Contributor
Author
|
Making |
dmurphy18
approved these changes
Sep 30, 2022
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Python 3.10 introduced
platform.freedesktop_os_releasewhich does the same as_parse_os_release("/etc/os-release", "/usr/lib/os-release").The parsing of the os-release file is very similar and differs only slightly in the used regular expressions. In contrast to
_parse_os_release,platform.freedesktop_os_releasecaches the result of the parsed os-release file.Use
platform.freedesktop_os_releasewhen available. When salt drops the support for Python < 3.10 (some time in the distant future),_parse_os_releasecan be removed.Also update the OS grains test cases to use /etc/os-release data from still supported Debian/Ubuntu releases.
This merge request contains the commits from the merge request #61597. So I recommend to review and merge #61597 first.