Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/68132.added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Added Fedora 42 to test CI, and dropped Fedora 40, in accordance with Fedora OS support policy.
2 changes: 1 addition & 1 deletion requirements/pytest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mock >= 3.0.0
docker >= 7.1.0; python_version >= '3.8'
docker < 7.1.0; python_version < '3.8'
pytest >= 7.2.0
pytest-salt-factories >= 1.0.0
pytest-salt-factories >= 1.0.5
pytest-helpers-namespace >= 2019.1.8
pytest-subtests
pytest-timeout >= 2.3.1
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.10/cloud.txt
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ pytest-custom-exit-code==0.3.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/pytest.txt
Expand All @@ -504,7 +504,7 @@ pytest-httpserver==1.0.8
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/pytest.txt
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.10/darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -352,14 +352,14 @@ pyserial==3.4
# via junos-eznc
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.10/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -343,14 +343,14 @@ pyserial==3.4
# via junos-eznc
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.10/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -361,14 +361,14 @@ pyserial==3.4
# via junos-eznc
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.11/cloud.txt
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ pytest-custom-exit-code==0.3.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/pytest.txt
Expand All @@ -468,7 +468,7 @@ pytest-httpserver==1.0.8
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/pytest.txt
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.11/darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -323,14 +323,14 @@ pyrsistent==0.17.3
# via jsonschema
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.11/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -320,14 +320,14 @@ pyrsistent==0.17.3
# via jsonschema
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.11/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -338,14 +338,14 @@ pyrsistent==0.17.3
# via jsonschema
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.11/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.12/cloud.txt
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ pytest-custom-exit-code==0.3.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/pytest.txt
Expand All @@ -463,7 +463,7 @@ pytest-httpserver==1.0.8
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/pytest.txt
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.12/darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -319,14 +319,14 @@ pyrsistent==0.17.3
# via jsonschema
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.12/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,14 @@ pyrsistent==0.17.3
# via jsonschema
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.12/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -334,14 +334,14 @@ pyrsistent==0.17.3
# via jsonschema
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.12/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ pytest-helpers-namespace==2021.12.29
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.9.7 ; python_version >= "3.10"
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.9/cloud.txt
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ pytest-custom-exit-code==0.3.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/pytest.txt
Expand All @@ -540,7 +540,7 @@ pytest-httpserver==1.0.8
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/pytest.txt
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.9/darwin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -381,14 +381,14 @@ pyserial==3.4
# netmiko
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0 ; python_version <= "3.9"
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.9/freebsd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -372,14 +372,14 @@ pyserial==3.4
# netmiko
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0 ; python_version <= "3.9"
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.9/linux.txt
Original file line number Diff line number Diff line change
Expand Up @@ -383,14 +383,14 @@ pyserial==3.4
# netmiko
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0 ; python_version <= "3.9"
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.9/windows.txt
Original file line number Diff line number Diff line change
Expand Up @@ -324,14 +324,14 @@ pyrsistent==0.17.3
# via jsonschema
pytest-custom-exit-code==0.3.0
# via -r requirements/pytest.txt
pytest-helpers-namespace==2021.4.29
pytest-helpers-namespace==2021.12.29
# via
# -r requirements/pytest.txt
# pytest-salt-factories
# pytest-shell-utilities
pytest-httpserver==1.0.8
# via -r requirements/pytest.txt
pytest-salt-factories==1.0.1
pytest-salt-factories==1.0.5
# via -r requirements/pytest.txt
pytest-shell-utilities==1.8.0 ; python_version <= "3.9"
# via
Expand Down
2 changes: 1 addition & 1 deletion tests/pytests/unit/modules/test_yumpkg.py
Original file line number Diff line number Diff line change
Expand Up @@ -2477,7 +2477,7 @@ def test_get_yum_config(grains):
# This one seems to be in all of them...
# If this ever breaks in the future, we'll need to get more specific
# than os_family
setting = "installonly_limit"
setting = "reposdir"
result = yumpkg._get_yum_config()
assert setting in result

Expand Down
6 changes: 3 additions & 3 deletions tools/precommit/workflows.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@
container="ghcr.io/saltstack/salt-ci-containers/testing:debian-12",
),
Linux(
slug="fedora-40",
display_name="Fedora 40",
slug="fedora-42",
display_name="Fedora 42",
arch="x86_64",
container="ghcr.io/saltstack/salt-ci-containers/testing:fedora-40",
container="ghcr.io/saltstack/salt-ci-containers/testing:fedora-42",
),
# Linux(slug="opensuse-15", display_name="Opensuse 15", arch="x86_64"),
Linux(
Expand Down
Loading