summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhijeet Kasurde <akasurde@redhat.com>2023-09-20 01:48:33 +0200
committerGitHub <noreply@github.com>2023-09-20 01:48:33 +0200
commit4b7705b07a64408515d0e164b62d4a8f814918db (patch)
tree092077c2b69d041427c5493783fbf2907a36c497
parentFix ansible-test issues with detecting docker host and forwarding ports (#81726) (diff)
downloadansible-4b7705b07a64408515d0e164b62d4a8f814918db.tar.xz
ansible-4b7705b07a64408515d0e164b62d4a8f814918db.zip
Remove deprecated APIs from ansible-doc (#81729)
* Removed add_collection_plugins * Removed find_plugins Fixes: #81716 Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
-rw-r--r--changelogs/fragments/81716-ansible-doc.yml3
-rwxr-xr-xlib/ansible/cli/doc.py10
-rw-r--r--test/sanity/ignore.txt1
3 files changed, 3 insertions, 11 deletions
diff --git a/changelogs/fragments/81716-ansible-doc.yml b/changelogs/fragments/81716-ansible-doc.yml
new file mode 100644
index 0000000000..7dcb2901f9
--- /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 4a5c892816..d14832f58e 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))
@@ -425,11 +420,6 @@ class DocCLI(CLI, RoleMixin):
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):
# general formatting
diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt
index 7dae942c0c..1076a5c331 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