From c7af6a420cb069d29fd57928dfbc600a395850f1 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Wed, 29 Jul 2020 23:16:12 +0530 Subject: [PATCH 1/2] Update Code of Conduct references --- README.rst | 4 ++-- docs/html/index.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 4f0f210f0..395b642d6 100644 --- a/README.rst +++ b/README.rst @@ -38,7 +38,7 @@ Code of Conduct --------------- Everyone interacting in the pip project's codebases, issue trackers, chat -rooms, and mailing lists is expected to follow the `PyPA Code of Conduct`_. +rooms, and mailing lists is expected to follow the `PSF Code of Conduct`_. .. _package installer: https://packaging.python.org/guides/tool-recommendations/ .. _Python Package Index: https://pypi.org @@ -54,4 +54,4 @@ rooms, and mailing lists is expected to follow the `PyPA Code of Conduct`_. .. _Development mailing list: https://mail.python.org/mailman3/lists/distutils-sig.python.org/ .. _User IRC: https://webchat.freenode.net/?channels=%23pypa .. _Development IRC: https://webchat.freenode.net/?channels=%23pypa-dev -.. _PyPA Code of Conduct: https://www.pypa.io/en/latest/code-of-conduct/ +.. _PSF Code of Conduct: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md diff --git a/docs/html/index.rst b/docs/html/index.rst index ff41fc42b..1ec915585 100644 --- a/docs/html/index.rst +++ b/docs/html/index.rst @@ -35,7 +35,7 @@ Code of Conduct =============== Everyone interacting in the pip project's codebases, issue trackers, chat -rooms, and mailing lists is expected to follow the `PyPA Code of Conduct`_. +rooms, and mailing lists is expected to follow the `PSF Code of Conduct`_. .. _package installer: https://packaging.python.org/guides/tool-recommendations/ .. _Python Package Index: https://pypi.org @@ -49,4 +49,4 @@ rooms, and mailing lists is expected to follow the `PyPA Code of Conduct`_. .. _Development mailing list: https://mail.python.org/mailman3/lists/distutils-sig.python.org/ .. _User IRC: https://webchat.freenode.net/?channels=%23pypa .. _Development IRC: https://webchat.freenode.net/?channels=%23pypa-dev -.. _PyPA Code of Conduct: https://www.pypa.io/en/latest/code-of-conduct/ +.. _PSF Code of Conduct: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md From 5dac5dc098df3e6a5b132c041b06ffa739ca6a14 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Wed, 29 Jul 2020 23:16:56 +0530 Subject: [PATCH 2/2] Drop CoC reference from new issue templates --- .github/ISSUE_TEMPLATE/config.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 3babf35bd..8e5c268c1 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ # Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser blank_issues_enabled: true # default contact_links: -- name: 🤷💻🤦 Discourse +- name: 💬 Discourse url: https://discuss.python.org/c/packaging about: | Please ask typical Q&A here: general ideas for Python packaging, @@ -9,6 +9,3 @@ contact_links: - name: '💬 IRC: #pypa @ Freenode' url: https://webchat.freenode.net/#pypa about: Chat with devs -- name: 📝 PyPA Code of Conduct - url: https://www.pypa.io/en/latest/code-of-conduct/ - about: ❤ Be nice to other members of the community. ☮ Behave.