commit: 5f4adadb15d2b71a062e75f0aeb9a7f8701b216c Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Wed Jun 29 08:58:01 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Mon Jul 18 21:41:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4adadb
app-admin/salt: remove unused patches Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/26138 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> app-admin/salt/files/salt-3003-tests.patch | 139 ------------------------ app-admin/salt/files/salt-3003.3-jinja.patch | 155 --------------------------- 2 files changed, 294 deletions(-) diff --git a/app-admin/salt/files/salt-3003-tests.patch b/app-admin/salt/files/salt-3003-tests.patch deleted file mode 100644 index c3562c5a4448..000000000000 --- a/app-admin/salt/files/salt-3003-tests.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff --git a/tests/integration/grains/test_core.py b/tests/integration/grains/test_core.py -index 5f1cf11e24..8affb398ff 100644 ---- a/tests/integration/grains/test_core.py -+++ b/tests/integration/grains/test_core.py -@@ -21,6 +21,7 @@ def _freebsd_or_openbsd(): - return salt.utils.platform.is_freebsd() or salt.utils.platform.is_openbsd() - - -+@pytest.mark.skip("Tests only should run on FreeBSD and OpenBSD") - @pytest.mark.windows_whitelisted - class TestGrainsCore(ModuleCase): - """ -diff --git a/tests/integration/states/test_x509.py b/tests/integration/states/test_x509.py -index 2321689ef5..574de51e56 100644 ---- a/tests/integration/states/test_x509.py -+++ b/tests/integration/states/test_x509.py -@@ -468,7 +468,7 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ== - first_run[key]["changes"]["Certificate"]["New"]["Not After"], - "%Y-%m-%d %H:%M:%S", - ) -- self.assertEqual(29, (expiry - datetime.datetime.now()).days) -+ self.assertEqual(30, (expiry - datetime.datetime.now()).days) - self.assertTrue(os.path.exists(crtfile), "Certificate was not created.") - - with salt.utils.files.fopen(crtfile, "r") as first_cert: -@@ -485,14 +485,14 @@ c9bcgp7D7xD+TxWWNj4CSXEccJgGr91StV+gFg4ARQ== - }, - ) - self.assertEqual( -- "Certificate needs renewal: 29 days remaining but it needs to be at least 90", -+ "Certificate needs renewal: 30 days remaining but it needs to be at least 90", - second_run[key]["changes"]["Status"]["Old"], - ) - expiry = datetime.datetime.strptime( - second_run[key]["changes"]["Certificate"]["New"]["Not After"], - "%Y-%m-%d %H:%M:%S", - ) -- self.assertEqual(179, (expiry - datetime.datetime.now()).days) -+ self.assertEqual(180, (expiry - datetime.datetime.now()).days) - with salt.utils.files.fopen(crtfile, "r") as second_cert: - self.assertNotEqual( - cert_contents, -diff --git a/tests/pytests/unit/modules/test_cmdmod.py b/tests/pytests/unit/modules/test_cmdmod.py -index 5424514160..0564b59593 100644 ---- a/tests/pytests/unit/modules/test_cmdmod.py -+++ b/tests/pytests/unit/modules/test_cmdmod.py -@@ -438,6 +438,7 @@ def test_run_cwd_doesnt_exist_issue_7154(): - - @pytest.mark.skip_on_darwin - @pytest.mark.skip_on_windows -+@pytest.mark.skip("does not work in sandbox environment") - def test_run_cwd_in_combination_with_runas(): - """ - cmd.run executes command in the cwd directory -diff --git a/tests/unit/ext/test_ipaddress.py b/tests/unit/ext/test_ipaddress.py -index 4fd87d1c3f..02585a9e4e 100644 ---- a/tests/unit/ext/test_ipaddress.py -+++ b/tests/unit/ext/test_ipaddress.py -@@ -2682,6 +2682,7 @@ class IpaddrUnitTest(TestCase): - "2001:658:22a:cafe:200::1/::ffff:ffff:ffff:ffff", - ) - -+ @pytest.mark.skip("_cache no longer present in python3.8+") - def testNetworkElementCaching(self): - # V4 - make sure we're empty - self.assertNotIn("broadcast_address", self.ipv4_network._cache) -diff --git a/tests/unit/utils/test_parsers.py b/tests/unit/utils/test_parsers.py -index 907c67f477..2429d27641 100644 ---- a/tests/unit/utils/test_parsers.py -+++ b/tests/unit/utils/test_parsers.py -@@ -5,6 +5,7 @@ - import os - import shutil - import tempfile -+import pytest - - import salt.config - import salt.log.setup as log -@@ -983,6 +984,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase): - if os.path.exists(self.log_file): - os.unlink(self.log_file) - -+ @pytest.mark.skip("Tries to write to /var") - def test_jid_option(self): - jid = salt.utils.jid.gen_jid({}) - args = ["--jid", jid] -@@ -991,6 +993,7 @@ class SaltRunOptionParserTestCase(ParserBase, TestCase): - parser.parse_args(args) - assert parser.options.jid == jid - -+ @pytest.mark.skip("Tries to write to /var") - def test_jid_option_invalid(self): - jid = salt.utils.jid.gen_jid({}) + "A" - args = ["--jid", jid] -@@ -1041,6 +1044,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase): - if os.path.exists(self.ssh_log_file): - os.unlink(self.ssh_log_file) - -+ @pytest.mark.skip("Tries to write to /var") - def test_jid_option(self): - jid = salt.utils.jid.gen_jid({}) - args = ["--jid", jid] + self.args -@@ -1049,6 +1053,7 @@ class SaltSSHOptionParserTestCase(ParserBase, TestCase): - parser.parse_args(args) - assert parser.options.jid == jid - -+ @pytest.mark.skip("Tries to write to /var") - def test_jid_option_invalid(self): - jid = salt.utils.jid.gen_jid({}) + "A" - args = ["--jid", jid] + self.args -diff --git a/tests/unit/utils/test_vt.py b/tests/unit/utils/test_vt.py -index 87fc6a342c..12d4c6a073 100644 ---- a/tests/unit/utils/test_vt.py -+++ b/tests/unit/utils/test_vt.py -@@ -20,6 +20,8 @@ import subprocess - import sys - import time - -+import pytest -+ - # Import Salt libs - import salt.utils - import salt.utils.files -@@ -274,6 +276,7 @@ class VTTestCase(TestCase): - salt.utils.platform.is_windows(), "Skip VT tests on windows, due to issue 54290" - ) - @fixStdOutErrFileNoIfNeeded -+ @pytest.mark.skip("Does not work in sandbox environment") - def test_split_multibyte_characters_unicode(self): - """ - Tests that the vt correctly handles multibyte characters that are -@@ -341,6 +344,7 @@ class VTTestCase(TestCase): - salt.utils.platform.is_windows(), "Skip VT tests on windows, due to issue 54290" - ) - @fixStdOutErrFileNoIfNeeded -+ @pytest.mark.skip("Does not work in sandbox environment") - def test_split_multibyte_characters_shiftjis(self): - """ - Tests that the vt correctly handles multibyte characters that are diff --git a/app-admin/salt/files/salt-3003.3-jinja.patch b/app-admin/salt/files/salt-3003.3-jinja.patch deleted file mode 100644 index ec5b1ac6156f..000000000000 --- a/app-admin/salt/files/salt-3003.3-jinja.patch +++ /dev/null @@ -1,155 +0,0 @@ -https://github.com/saltstack/salt/issues/61848 -https://patch-diff.githubusercontent.com/raw/saltstack/salt/pull/61856.patch - -Dropped a bunch of irrelevant hunks (CI files and a test not in 3003.3) - -From 03c2a607a0722ad5e55b6c8f8eda630be7c7fee5 Mon Sep 17 00:00:00 2001 -From: jonyhy96 <hy352144...@gmail.com> -Date: Thu, 10 Mar 2022 10:41:48 +0800 -Subject: [PATCH 1/5] fix: jinja2 contextfuntion base on version - ---- - salt/utils/jinja.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py -index 4c430b5ccf32..9a1938c2d69b 100644 ---- a/salt/utils/jinja.py -+++ b/salt/utils/jinja.py -@@ -707,7 +707,11 @@ def method_call(obj, f_name, *f_args, **f_kwargs): - return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs) - - --@jinja2.contextfunction -+if jinja2.__version__ < '3.0.0' : -+ contextfunction = jinja2.contextfunction -+else: -+ contextfunction = jinja2.pass_context -+@contextfunction - def show_full_context(ctx): - return salt.utils.data.simple_types_filter( - {key: value for key, value in ctx.items()} - -From 1aba938021b86732a211a899dc4c2a46afa488a2 Mon Sep 17 00:00:00 2001 -From: jonyhy96 <hy352144...@gmail.com> -Date: Thu, 3 Mar 2022 16:21:17 +0800 -Subject: [PATCH 2/5] fix: jinja2 DeprecationWarning - ---- - salt/utils/jinja.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py -index 9a1938c2d69b..207a2cb77035 100644 ---- a/salt/utils/jinja.py -+++ b/salt/utils/jinja.py -@@ -710,7 +710,7 @@ def method_call(obj, f_name, *f_args, **f_kwargs): - if jinja2.__version__ < '3.0.0' : - contextfunction = jinja2.contextfunction - else: -- contextfunction = jinja2.pass_context -+ contextfunction = jinja2.pass_context - @contextfunction - def show_full_context(ctx): - return salt.utils.data.simple_types_filter( - -From 7f281bbfc8efda40cfe7d607c0ddebb2fb00bd5d Mon Sep 17 00:00:00 2001 -From: Megan Wilhite <mwilh...@vmware.com> -Date: Fri, 25 Mar 2022 08:31:24 -0600 -Subject: [PATCH 3/5] Use the correct Markup from jinja for each version - ---- - salt/utils/jinja.py | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py -index 207a2cb77035..558f063d7206 100644 ---- a/salt/utils/jinja.py -+++ b/salt/utils/jinja.py -@@ -26,7 +26,7 @@ - import salt.utils.stringutils - import salt.utils.url - import salt.utils.yaml --from jinja2 import BaseLoader, Markup, TemplateNotFound, nodes -+from jinja2 import BaseLoader, TemplateNotFound, nodes - from jinja2.environment import TemplateModule - from jinja2.exceptions import TemplateRuntimeError - from jinja2.ext import Extension -@@ -35,6 +35,12 @@ - from salt.utils.odict import OrderedDict - from salt.utils.versions import LooseVersion - -+try: -+ from jinja2 import Markup -+except ImportError: -+ # Markup moved to markupsafe in jinja>= 3.1 -+ from markupsafe import Markup -+ - log = logging.getLogger(__name__) - - __all__ = ["SaltCacheLoader", "SerializerExtension"] - -diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py -index 558f063d7206..5d00b134e25f 100644 ---- a/salt/utils/jinja.py -+++ b/salt/utils/jinja.py -@@ -713,10 +713,12 @@ def method_call(obj, f_name, *f_args, **f_kwargs): - return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs) - - --if jinja2.__version__ < '3.0.0' : -+if jinja2.__version__ < "3.0.0": - contextfunction = jinja2.contextfunction - else: - contextfunction = jinja2.pass_context -+ -+ - @contextfunction - def show_full_context(ctx): - return salt.utils.data.simple_types_filter( - -From 9056e636beaea7de2e3a61876ba0345e5d390973 Mon Sep 17 00:00:00 2001 -From: Megan Wilhite <mwilh...@vmware.com> -Date: Fri, 25 Mar 2022 11:14:01 -0600 -Subject: [PATCH 5/5] Fix requested feedback - ---- - requirements/static/ci/docs.in | 1 + - requirements/static/ci/py3.10/docs.txt | 3 ++- - requirements/static/ci/py3.6/docs.txt | 1 + - requirements/static/ci/py3.7/docs.txt | 3 ++- - requirements/static/ci/py3.8/docs.txt | 3 ++- - requirements/static/ci/py3.9/docs.txt | 3 ++- - salt/utils/jinja.py | 10 +++++----- - 8 files changed, 21 insertions(+), 10 deletions(-) - -diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py -index 5d00b134e25f..aa8ebe90546c 100644 ---- a/salt/utils/jinja.py -+++ b/salt/utils/jinja.py -@@ -36,10 +36,10 @@ - from salt.utils.versions import LooseVersion - - try: -- from jinja2 import Markup --except ImportError: -- # Markup moved to markupsafe in jinja>= 3.1 - from markupsafe import Markup -+except ImportError: -+ # jinja < 3.1 -+ from jinja2 import Markup - - log = logging.getLogger(__name__) - -@@ -713,9 +713,9 @@ def method_call(obj, f_name, *f_args, **f_kwargs): - return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs) - - --if jinja2.__version__ < "3.0.0": -+try: - contextfunction = jinja2.contextfunction --else: -+except AttributeError: - contextfunction = jinja2.pass_context - -
