From 4f02418ec059a10072fb42153781960944472575 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 22 Aug 2024 22:48:41 +0200 Subject: [PATCH] Remove mention of mailing list from Ansible's README, make sure to mention the forum instead. --- changelogs/fragments/613-mailing-list-removal.yml | 2 ++ src/antsibull/data/ansible-readme.rst | 12 ++++++------ src/antsibull/data/ansible-setup_py.j2 | 2 +- src/antsibull/python_metadata.py | 2 -- tests/test_data/package-files/7.5.0/README.rst | 12 ++++++------ tests/test_data/package-files/8.1.0/README.rst | 12 ++++++------ .../package-files/force_setup_cfg/8.1.0/README.rst | 12 ++++++------ .../package-files/force_setup_cfg/8.1.0/setup.cfg | 1 - 8 files changed, 27 insertions(+), 28 deletions(-) diff --git a/changelogs/fragments/613-mailing-list-removal.yml b/changelogs/fragments/613-mailing-list-removal.yml index 30874157..356ed2ca 100644 --- a/changelogs/fragments/613-mailing-list-removal.yml +++ b/changelogs/fragments/613-mailing-list-removal.yml @@ -1,3 +1,5 @@ removed_features: - "The ``announcements --send`` command no longer attempts to send mails to the mailing lists, which have been sunset (https://github.com/ansible-community/antsibull/pull/613)." +minor_changes: + - "Remove the mention of mailing lists from the Ansible README (https://github.com/ansible-community/antsibull/pull/613)." diff --git a/src/antsibull/data/ansible-readme.rst b/src/antsibull/data/ansible-readme.rst index b2a32bd3..d912ec8c 100644 --- a/src/antsibull/data/ansible-readme.rst +++ b/src/antsibull/data/ansible-readme.rst @@ -3,7 +3,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: Ansible Project, 2020 -|PyPI version| |Docs badge| |Chat badge| |Code Of Conduct| |Mailing Lists| |License| +|PyPI version| |Docs badge| |Chat badge| |Code Of Conduct| |Forum| |License| ******* Ansible @@ -71,7 +71,7 @@ Get Involved ============ * Read `Community Information `_ for ways to contribute to - and interact with the project, including mailing list information and how + and interact with the project, including forum information and how to submit bug reports and code to Ansible or Ansible collections. * Join a `Working Group `_, an organized community devoted to a specific technology domain or platform. @@ -79,7 +79,7 @@ Get Involved to avoid duplicate efforts. This not only helps everyone know what is going on, but it also helps save time and effort if we decide some changes are needed. -* For a list of email lists, Matrix and IRC channels, and Working Groups, see the +* For a reference to the Forum, a list of Matrix and IRC channels, and Working Groups, see the `Communication page `_ Coding Guidelines @@ -135,9 +135,9 @@ for the full license text. .. |Code Of Conduct| image:: https://img.shields.io/badge/code%20of%20conduct-Ansible-silver.svg :target: https://docs.ansible.com/ansible/latest/community/code_of_conduct.html :alt: Ansible Code of Conduct -.. |Mailing Lists| image:: https://img.shields.io/badge/mailing%20lists-Ansible-orange.svg - :target: https://docs.ansible.com/ansible/latest/community/communication.html#mailing-list-information - :alt: Ansible mailing lists +.. |Forum| image:: https://img.shields.io/badge/forum-Ansible-orange.svg + :target: https://forum.ansible.com/ + :alt: Ansible Forum .. |License| image:: https://img.shields.io/badge/license-GPL%20v3.0-brightgreen.svg :target: COPYING :alt: Repository License diff --git a/src/antsibull/data/ansible-setup_py.j2 b/src/antsibull/data/ansible-setup_py.j2 index 4571f59c..c22a7044 100644 --- a/src/antsibull/data/ansible-setup_py.j2 +++ b/src/antsibull/data/ansible-setup_py.j2 @@ -34,7 +34,7 @@ setup( 'Bug Tracker': 'https://github.com/ansible/ansible/issues', 'Code of Conduct': 'https://docs.ansible.com/ansible/latest/community/code_of_conduct.html', 'Documentation': 'https://docs.ansible.com/ansible/', - 'Mailing lists': 'https://docs.ansible.com/ansible/latest/community/communication.html#mailing-list-information', + 'Forum': 'https://forum.ansible.com/', 'Source Code': 'https://github.com/ansible/ansible', }, license='GPLv3+', diff --git a/src/antsibull/python_metadata.py b/src/antsibull/python_metadata.py index d4368d9a..6a11cf06 100644 --- a/src/antsibull/python_metadata.py +++ b/src/antsibull/python_metadata.py @@ -83,8 +83,6 @@ def _i_iter_lines(self) -> Iterator[str]: "Code of Conduct": DOCSITE_COMMUNITY_URL + "/code_of_conduct.html", "Documentation": DOCSITE_BASE_URL, "Forum": ANSIBLE_FORUM_URL, - "Mailing lists": DOCSITE_COMMUNITY_URL - + "/communication.html#mailing-list-information", } ) diff --git a/tests/test_data/package-files/7.5.0/README.rst b/tests/test_data/package-files/7.5.0/README.rst index b2a32bd3..d912ec8c 100644 --- a/tests/test_data/package-files/7.5.0/README.rst +++ b/tests/test_data/package-files/7.5.0/README.rst @@ -3,7 +3,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: Ansible Project, 2020 -|PyPI version| |Docs badge| |Chat badge| |Code Of Conduct| |Mailing Lists| |License| +|PyPI version| |Docs badge| |Chat badge| |Code Of Conduct| |Forum| |License| ******* Ansible @@ -71,7 +71,7 @@ Get Involved ============ * Read `Community Information `_ for ways to contribute to - and interact with the project, including mailing list information and how + and interact with the project, including forum information and how to submit bug reports and code to Ansible or Ansible collections. * Join a `Working Group `_, an organized community devoted to a specific technology domain or platform. @@ -79,7 +79,7 @@ Get Involved to avoid duplicate efforts. This not only helps everyone know what is going on, but it also helps save time and effort if we decide some changes are needed. -* For a list of email lists, Matrix and IRC channels, and Working Groups, see the +* For a reference to the Forum, a list of Matrix and IRC channels, and Working Groups, see the `Communication page `_ Coding Guidelines @@ -135,9 +135,9 @@ for the full license text. .. |Code Of Conduct| image:: https://img.shields.io/badge/code%20of%20conduct-Ansible-silver.svg :target: https://docs.ansible.com/ansible/latest/community/code_of_conduct.html :alt: Ansible Code of Conduct -.. |Mailing Lists| image:: https://img.shields.io/badge/mailing%20lists-Ansible-orange.svg - :target: https://docs.ansible.com/ansible/latest/community/communication.html#mailing-list-information - :alt: Ansible mailing lists +.. |Forum| image:: https://img.shields.io/badge/forum-Ansible-orange.svg + :target: https://forum.ansible.com/ + :alt: Ansible Forum .. |License| image:: https://img.shields.io/badge/license-GPL%20v3.0-brightgreen.svg :target: COPYING :alt: Repository License diff --git a/tests/test_data/package-files/8.1.0/README.rst b/tests/test_data/package-files/8.1.0/README.rst index b2a32bd3..d912ec8c 100644 --- a/tests/test_data/package-files/8.1.0/README.rst +++ b/tests/test_data/package-files/8.1.0/README.rst @@ -3,7 +3,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: Ansible Project, 2020 -|PyPI version| |Docs badge| |Chat badge| |Code Of Conduct| |Mailing Lists| |License| +|PyPI version| |Docs badge| |Chat badge| |Code Of Conduct| |Forum| |License| ******* Ansible @@ -71,7 +71,7 @@ Get Involved ============ * Read `Community Information `_ for ways to contribute to - and interact with the project, including mailing list information and how + and interact with the project, including forum information and how to submit bug reports and code to Ansible or Ansible collections. * Join a `Working Group `_, an organized community devoted to a specific technology domain or platform. @@ -79,7 +79,7 @@ Get Involved to avoid duplicate efforts. This not only helps everyone know what is going on, but it also helps save time and effort if we decide some changes are needed. -* For a list of email lists, Matrix and IRC channels, and Working Groups, see the +* For a reference to the Forum, a list of Matrix and IRC channels, and Working Groups, see the `Communication page `_ Coding Guidelines @@ -135,9 +135,9 @@ for the full license text. .. |Code Of Conduct| image:: https://img.shields.io/badge/code%20of%20conduct-Ansible-silver.svg :target: https://docs.ansible.com/ansible/latest/community/code_of_conduct.html :alt: Ansible Code of Conduct -.. |Mailing Lists| image:: https://img.shields.io/badge/mailing%20lists-Ansible-orange.svg - :target: https://docs.ansible.com/ansible/latest/community/communication.html#mailing-list-information - :alt: Ansible mailing lists +.. |Forum| image:: https://img.shields.io/badge/forum-Ansible-orange.svg + :target: https://forum.ansible.com/ + :alt: Ansible Forum .. |License| image:: https://img.shields.io/badge/license-GPL%20v3.0-brightgreen.svg :target: COPYING :alt: Repository License diff --git a/tests/test_data/package-files/force_setup_cfg/8.1.0/README.rst b/tests/test_data/package-files/force_setup_cfg/8.1.0/README.rst index b2a32bd3..d912ec8c 100644 --- a/tests/test_data/package-files/force_setup_cfg/8.1.0/README.rst +++ b/tests/test_data/package-files/force_setup_cfg/8.1.0/README.rst @@ -3,7 +3,7 @@ SPDX-License-Identifier: GPL-3.0-or-later SPDX-FileCopyrightText: Ansible Project, 2020 -|PyPI version| |Docs badge| |Chat badge| |Code Of Conduct| |Mailing Lists| |License| +|PyPI version| |Docs badge| |Chat badge| |Code Of Conduct| |Forum| |License| ******* Ansible @@ -71,7 +71,7 @@ Get Involved ============ * Read `Community Information `_ for ways to contribute to - and interact with the project, including mailing list information and how + and interact with the project, including forum information and how to submit bug reports and code to Ansible or Ansible collections. * Join a `Working Group `_, an organized community devoted to a specific technology domain or platform. @@ -79,7 +79,7 @@ Get Involved to avoid duplicate efforts. This not only helps everyone know what is going on, but it also helps save time and effort if we decide some changes are needed. -* For a list of email lists, Matrix and IRC channels, and Working Groups, see the +* For a reference to the Forum, a list of Matrix and IRC channels, and Working Groups, see the `Communication page `_ Coding Guidelines @@ -135,9 +135,9 @@ for the full license text. .. |Code Of Conduct| image:: https://img.shields.io/badge/code%20of%20conduct-Ansible-silver.svg :target: https://docs.ansible.com/ansible/latest/community/code_of_conduct.html :alt: Ansible Code of Conduct -.. |Mailing Lists| image:: https://img.shields.io/badge/mailing%20lists-Ansible-orange.svg - :target: https://docs.ansible.com/ansible/latest/community/communication.html#mailing-list-information - :alt: Ansible mailing lists +.. |Forum| image:: https://img.shields.io/badge/forum-Ansible-orange.svg + :target: https://forum.ansible.com/ + :alt: Ansible Forum .. |License| image:: https://img.shields.io/badge/license-GPL%20v3.0-brightgreen.svg :target: COPYING :alt: Repository License diff --git a/tests/test_data/package-files/force_setup_cfg/8.1.0/setup.cfg b/tests/test_data/package-files/force_setup_cfg/8.1.0/setup.cfg index d1d2348d..5fa90223 100644 --- a/tests/test_data/package-files/force_setup_cfg/8.1.0/setup.cfg +++ b/tests/test_data/package-files/force_setup_cfg/8.1.0/setup.cfg @@ -28,7 +28,6 @@ project_urls = Code of Conduct = https://docs.ansible.com/ansible/latest/community/code_of_conduct.html Documentation = https://docs.ansible.com/ansible Forum = https://forum.ansible.com - Mailing lists = https://docs.ansible.com/ansible/latest/community/communication.html#mailing-list-information [options] zip_safe = False