Skip to content

Commit 37cc0ea

Browse files
authored
Merge branch '6.19.z' into cherry-pick-6.19.z-c48497990a02092a03e2efeab32af9d1722c4536
2 parents c10aeb1 + 1e7706d commit 37cc0ea

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repos:
1212
- id: check-yaml
1313
- id: debug-statements
1414
- repo: https://github.com/astral-sh/ruff-pre-commit
15-
rev: v0.15.0
15+
rev: v0.15.1
1616
hooks:
1717
- id: ruff
1818
args: [--fix, --exit-non-zero-on-fix, --target-version=py310]

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ broker[satlab,docker,ssh2_python]==0.8.2
55
cryptography==46.0.5
66
deepdiff==8.6.1
77
dynaconf[vault]==3.2.12
8-
fastmcp==2.14.5
8+
fastmcp==3.0.0
99
fauxfactory==4.2.0
1010
jinja2==3.1.6
1111
manifester==0.2.14

tests/foreman/api/test_provisioningtemplate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ def test_positive_verify_chronyd_timesource_kickstart_template(
782782
assert f'timesource --ntp-server {ntp_server_value}' in render
783783
assert f'timezone --utc {timezone}' in render
784784
else:
785-
assert f'timezone --utc {timezone} --ntpservers {ntp_server_value}' in render
785+
assert f'timezone --ntpservers {ntp_server_value} --utc {timezone}' in render
786786

787787
@pytest.mark.rhel_ver_match(r'^(?!.*fips).*$')
788788
def test_create_host_with_invalid_template(

0 commit comments

Comments
 (0)