summaryrefslogtreecommitdiff
path: root/app-admin/salt/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-03-16 18:48:52 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-03-16 18:48:52 +0000
commitf265f17242b04ae036b4dc174fa95401d895dbc5 (patch)
tree8daa848087a673b8bf5dad576b0a08048d551da7 /app-admin/salt/files
parentd08ea43e9ada434f42f4be8e115b67ab22ce38af (diff)
gentoo auto-resync : 16:03:2024 - 18:48:51
Diffstat (limited to 'app-admin/salt/files')
-rw-r--r--app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch12
-rw-r--r--app-admin/salt/files/salt-3006.3-tests.patch26
2 files changed, 0 insertions, 38 deletions
diff --git a/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch b/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch
deleted file mode 100644
index ff47115af210..000000000000
--- a/app-admin/salt/files/salt-3005-relax-pyzmq-dep.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt
-index eb4d796418..ffa1589043 100644
---- a/requirements/zeromq.txt
-+++ b/requirements/zeromq.txt
-@@ -1,6 +1,4 @@
- -r base.txt
- -r crypto.txt
-
--pyzmq<=20.0.0 ; python_version < "3.6"
--pyzmq>=17.0.0 ; python_version < "3.9"
--pyzmq>19.0.2 ; python_version >= "3.9"
-+pyzmq
diff --git a/app-admin/salt/files/salt-3006.3-tests.patch b/app-admin/salt/files/salt-3006.3-tests.patch
deleted file mode 100644
index 4d30608775cb..000000000000
--- a/app-admin/salt/files/salt-3006.3-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/tests/pytests/unit/utils/event/test_event.py b/tests/pytests/unit/utils/event/test_event.py
-index e289e72dad..2abd4066c4 100644
---- a/tests/pytests/unit/utils/event/test_event.py
-+++ b/tests/pytests/unit/utils/event/test_event.py
-@@ -300,7 +300,7 @@ def test_connect_pull_should_debug_log_on_StreamClosedError():
- event = SaltEvent(node=None)
- with patch.object(event, "pusher") as mock_pusher:
- with patch.object(
-- salt.utils.event.log, "debug", auto_spec=True
-+ salt.utils.event.log, "debug", auto_spec=True, unsafe=True
- ) as mock_log_debug:
- mock_pusher.connect.side_effect = (
- salt.ext.tornado.iostream.StreamClosedError
-@@ -317,10 +317,10 @@ def test_connect_pull_should_error_log_on_other_errors(error):
- event = SaltEvent(node=None)
- with patch.object(event, "pusher") as mock_pusher:
- with patch.object(
-- salt.utils.event.log, "debug", auto_spec=True
-+ salt.utils.event.log, "debug", auto_spec=True, unsafe=True
- ) as mock_log_debug:
- with patch.object(
-- salt.utils.event.log, "error", auto_spec=True
-+ salt.utils.event.log, "error", auto_spec=True, unsafe=True
- ) as mock_log_error:
- mock_pusher.connect.side_effect = error
- event.connect_pull()