218a0bb719
- Several fixes for tests to avoid errors and failures in some OSes - Speed up salt.matcher.confirm_top by using __context__ - Do not call the async wrapper calls with the separate thread - Prevent OOM with high amount of batch async calls (bsc#1216063) - Add missing contextvars dependency in salt.version - Skip tests for unsupported algorithm on old OpenSSL version - Remove redundant `_file_find` call to the master - Prevent possible exception in tornado.concurrent.Future._set_done - Make reactor engine less blocking the EventPublisher - Make salt-master self recoverable on killing EventPublisher - Improve broken events catching and reporting - Make logging calls lighter - Remove unused import causing delays on starting salt-master - Added: * improve-broken-events-catching-and-reporting.patch * add-missing-contextvars-dependency-in-salt.version.patch * prevent-oom-with-high-amount-of-batch-async-calls-bs.patch * speed-up-salt.matcher.confirm_top-by-using-__context.patch * remove-redundant-_file_find-call-to-the-master.patch * make-logging-calls-lighter.patch * make-salt-master-self-recoverable-on-killing-eventpu.patch * skip-tests-for-unsupported-algorithm-on-old-openssl-.patch * remove-unused-import-causing-delays-on-starting-salt.patch * do-not-call-the-async-wrapper-calls-with-the-separat.patch * prevent-possible-exception-in-tornado.concurrent.fut.patch * several-fixes-for-tests-to-avoid-errors-and-failures.patch * make-reactor-engine-less-blocking-the-eventpublisher.patch OBS-URL: https://build.opensuse.org/request/show/1177104 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=243
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From 1a5716365e0c3b8d290759847f4046f28ee4b79f Mon Sep 17 00:00:00 2001
|
|
From: Victor Zhestkov <vzhestkov@suse.com>
|
|
Date: Wed, 15 May 2024 09:53:20 +0200
|
|
Subject: [PATCH] Add missing contextvars dependency in salt.version
|
|
|
|
---
|
|
salt/version.py | 1 +
|
|
tests/unit/states/test_pip_state.py | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/version.py b/salt/version.py
|
|
index 44372830b2..b2643550e9 100644
|
|
--- a/salt/version.py
|
|
+++ b/salt/version.py
|
|
@@ -717,6 +717,7 @@ def dependency_information(include_salt_cloud=False):
|
|
("docker-py", "docker", "__version__"),
|
|
("packaging", "packaging", "__version__"),
|
|
("looseversion", "looseversion", None),
|
|
+ ("contextvars", "contextvars", None),
|
|
("relenv", "relenv", "__version__"),
|
|
]
|
|
|
|
diff --git a/tests/unit/states/test_pip_state.py b/tests/unit/states/test_pip_state.py
|
|
index d70b115000..fe5d171a15 100644
|
|
--- a/tests/unit/states/test_pip_state.py
|
|
+++ b/tests/unit/states/test_pip_state.py
|
|
@@ -419,7 +419,7 @@ class PipStateInstallationErrorTest(TestCase):
|
|
def test_importable_installation_error(self):
|
|
extra_requirements = []
|
|
for name, version in salt.version.dependency_information():
|
|
- if name in ["PyYAML", "packaging", "looseversion"]:
|
|
+ if name in ["PyYAML", "packaging", "looseversion", "contextvars"]:
|
|
extra_requirements.append("{}=={}".format(name, version))
|
|
failures = {}
|
|
pip_version_requirements = [
|
|
--
|
|
2.45.0
|
|
|