From 4b7705b07a64408515d0e164b62d4a8f814918db Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Tue, 19 Sep 2023 16:48:33 -0700 Subject: [PATCH] Remove deprecated APIs from ansible-doc (#81729) * Removed add_collection_plugins * Removed find_plugins Fixes: #81716 Signed-off-by: Abhijeet Kasurde --- changelogs/fragments/81716-ansible-doc.yml | 3 +++ lib/ansible/cli/doc.py | 10 ---------- test/sanity/ignore.txt | 1 - 3 files changed, 3 insertions(+), 11 deletions(-) create mode 100644 changelogs/fragments/81716-ansible-doc.yml diff --git a/changelogs/fragments/81716-ansible-doc.yml b/changelogs/fragments/81716-ansible-doc.yml new file mode 100644 index 00000000000..7dcb2901f94 --- /dev/null +++ b/changelogs/fragments/81716-ansible-doc.yml @@ -0,0 +1,3 @@ +--- +removed_features: + - Remove deprecated APIs from ansible-docs (https://github.com/ansible/ansible/issues/81716). diff --git a/lib/ansible/cli/doc.py b/lib/ansible/cli/doc.py index 4a5c8928160..d14832f58ea 100755 --- a/lib/ansible/cli/doc.py +++ b/lib/ansible/cli/doc.py @@ -51,11 +51,6 @@ PB_LOADED = {} SNIPPETS = ['inventory', 'lookup', 'module'] -def add_collection_plugins(plugin_list, plugin_type, coll_filter=None): - display.deprecated("add_collection_plugins method, use ansible.plugins.list functions instead.", version='2.17') - plugin_list.update(list_plugins(plugin_type, coll_filter)) - - def jdump(text): try: display.display(json_dump(text)) @@ -424,11 +419,6 @@ class DocCLI(CLI, RoleMixin): return f"`{text}' (of {plugin})" return f"`{text}'" - @classmethod - def find_plugins(cls, path, internal, plugin_type, coll_filter=None): - display.deprecated("find_plugins method as it is incomplete/incorrect. use ansible.plugins.list functions instead.", version='2.17') - return list_plugins(plugin_type, coll_filter, [path]).keys() - @classmethod def tty_ify(cls, text): diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt index 7dae942c0c9..1076a5c331b 100644 --- a/test/sanity/ignore.txt +++ b/test/sanity/ignore.txt @@ -201,5 +201,4 @@ README.md pymarkdown:line-length test/integration/targets/ansible-vault/invalid_format/README.md pymarkdown:no-bare-urls test/support/README.md pymarkdown:no-bare-urls test/units/cli/test_data/role_skeleton/README.md pymarkdown:line-length -lib/ansible/cli/doc.py pylint:ansible-deprecated-version # 2.17 deprecation lib/ansible/utils/encrypt.py pylint:ansible-deprecated-version # 2.17 deprecation