From 0073ab5fa65445043f7ee8d59b60fb0cd9082d60 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Tue, 23 Jun 2020 12:09:26 -0500 Subject: [PATCH] Nuke strategy.SharedPluginLoaderObj, depr. 2.11 (#70235) * Nuke strategy.SharedPluginLoaderObj, depr. 2.11 Change: - Nuke SharedPluginLoaderObj class - Update tests (which seemingly didn't use it anyway) - Changelog Test Plan: CI, grep Signed-off-by: Rick Elrod * Nuke from ignore.txt Signed-off-by: Rick Elrod --- .../deprecation-strategy-SharedPluginLoaderObj.yml | 2 ++ lib/ansible/plugins/strategy/__init__.py | 8 -------- test/sanity/ignore.txt | 1 - test/units/playbook/test_conditional.py | 2 -- 4 files changed, 2 insertions(+), 11 deletions(-) create mode 100644 changelogs/fragments/deprecation-strategy-SharedPluginLoaderObj.yml diff --git a/changelogs/fragments/deprecation-strategy-SharedPluginLoaderObj.yml b/changelogs/fragments/deprecation-strategy-SharedPluginLoaderObj.yml new file mode 100644 index 00000000000..00d701f0d87 --- /dev/null +++ b/changelogs/fragments/deprecation-strategy-SharedPluginLoaderObj.yml @@ -0,0 +1,2 @@ +removed_features: + - Removed `SharedPluginLoaderObj` class from ansible.plugins.strategy. It was deprecated in favor of using the standard plugin loader. diff --git a/lib/ansible/plugins/strategy/__init__.py b/lib/ansible/plugins/strategy/__init__.py index c6e03ab35ca..c66ef3fe627 100644 --- a/lib/ansible/plugins/strategy/__init__.py +++ b/lib/ansible/plugins/strategy/__init__.py @@ -67,14 +67,6 @@ class StrategySentinel: pass -def SharedPluginLoaderObj(): - '''This only exists for backwards compat, do not use. - ''' - display.deprecated('SharedPluginLoaderObj is deprecated, please directly use ansible.plugins.loader', - version='2.11', collection_name='ansible.builtin') - return plugin_loader - - _sentinel = StrategySentinel() diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt index ebd1d7739b6..22eda0cbfb2 100644 --- a/test/sanity/ignore.txt +++ b/test/sanity/ignore.txt @@ -183,7 +183,6 @@ lib/ansible/playbook/role/__init__.py pylint:blacklisted-name lib/ansible/plugins/action/normal.py action-plugin-docs # default action plugin for modules without a dedicated action plugin lib/ansible/plugins/cache/base.py ansible-doc!skip # not a plugin, but a stub for backwards compatibility lib/ansible/plugins/lookup/sequence.py pylint:blacklisted-name -lib/ansible/plugins/strategy/__init__.py pylint:ansible-deprecated-version lib/ansible/plugins/strategy/__init__.py pylint:blacklisted-name lib/ansible/plugins/strategy/linear.py pylint:blacklisted-name lib/ansible/vars/hostvars.py pylint:blacklisted-name diff --git a/test/units/playbook/test_conditional.py b/test/units/playbook/test_conditional.py index ce3514846d6..5a41b64462d 100644 --- a/test/units/playbook/test_conditional.py +++ b/test/units/playbook/test_conditional.py @@ -5,7 +5,6 @@ from units.compat import unittest from units.mock.loader import DictDataLoader from units.compat.mock import MagicMock -from ansible.plugins.strategy import SharedPluginLoaderObj from ansible.template import Templar from ansible import errors @@ -16,7 +15,6 @@ class TestConditional(unittest.TestCase): def setUp(self): self.loader = DictDataLoader({}) self.cond = conditional.Conditional(loader=self.loader) - self.shared_loader = SharedPluginLoaderObj() self.templar = Templar(loader=self.loader, variables={}) def _eval_con(self, when=None, variables=None):