Skip to content

Commit 1b9b5d9

Browse files
dukecat0ewjoachim
andauthored
Add Libera Chat and Discord in the docs (#9690)
* Add Libera Chat and Discord in the docs * Add Libera Chat and Discord in development/index.rst * Change to Libera from Freenode in docs * Update index.rst * Update index.rst * Update ~good-first-issue.md * Update index.rst * Update README.rst Co-authored-by: Joachim Jablon <[email protected]> * Update README.rst * Update README.rst * Update README.rst * Update index.rst * Update index.rst * Update index.rst * Update index.rst * Update index.rst * Update index.rst * Update index.rst * Update README.rst * Update index.rst * Update messages.pot Co-authored-by: Joachim Jablon <[email protected]>
1 parent b6e08b5 commit 1b9b5d9

File tree

6 files changed

+35
-21
lines changed

6 files changed

+35
-21
lines changed

.github/ISSUE_TEMPLATE/~good-first-issue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ about: For maintainers to create an issue that is good for new contributors
1111

1212
**Good First Issue**: This issue is good for first time contributors. If you've already contributed to Warehouse, work on [another issue without this label](https://github.com/pypa/warehouse/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+-label%3A%22good+first+issue%22) instead. If there is not a corresponding pull request for this issue, it is up for grabs. For directions for getting set up, see our [Getting Started Guide](https://warehouse.pypa.io/development/getting-started/).
1313

14-
If you are working on this issue and have questions, feel free to ask them here, in the [`#pypa-dev` chat channel on Freenode](https://webchat.freenode.net/?channels=%23pypa-dev), or on the [distutils-sig.python.org mailing list](https://mail.python.org/mailman3/lists/distutils-sig.python.org/).
14+
If you are working on this issue and have questions, feel free to ask them here, in the [`#pypa-dev` chat channel on Libera](https://web.libera.chat/#pypa-dev), or on the [distutils-sig.python.org mailing list](https://mail.python.org/mailman3/lists/distutils-sig.python.org/).
1515

1616
**Screenshot Required**: *If your pull request makes a visual change*, include a screenshot of your update. This helps our team give you feedback faster.

README.rst

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,17 @@ The canonical deployment of Warehouse is in production at `pypi.org`_.
1818
Discussion
1919
----------
2020

21-
If you run into bugs, you can file them in our `issue tracker`_.
2221

23-
You can also join the chat channels ``#pypa`` (general packaging
24-
discussion and user support) and ``#pypa-dev`` (discussion about
25-
development of packaging tools) `on Freenode`_, or the `distutils-sig mailing
26-
list`_, to ask questions or get involved.
22+
You can find help or get involved on:
23+
24+
- `Github issue tracker`_ for reporting issues
25+
- IRC: on `Libera`_, channel ``#pypa`` for general packaging discussion
26+
and user support, and ``#pypa-dev`` for
27+
discussions about development of packaging tools
28+
- The `PyPA Discord`_ for live discussions
29+
- The Packaging category on `Discourse`_ for discussing
30+
new ideas and community initiatives
31+
2732

2833
Testing
2934
----------
@@ -47,13 +52,15 @@ rooms, and mailing lists is expected to follow the `PSF Code of Conduct`_.
4752
.. _`architectural overview`: https://warehouse.readthedocs.io/application/
4853
.. _`documentation`: https://warehouse.readthedocs.io
4954
.. _`Getting started`: https://warehouse.readthedocs.io/development/getting-started/
50-
.. _`issue tracker`: https://github.com/pypa/warehouse/issues
55+
.. _`Github issue tracker`: https://github.com/pypa/warehouse/issues
5156
.. _`pypi.org`: https://pypi.org/
52-
.. _`on Freenode`: https://webchat.freenode.net/?channels=%23pypa-dev,pypa
5357
.. _`distutils-sig mailing list`: https://mail.python.org/mailman3/lists/distutils-sig.python.org/
5458
.. _`Running tests and linters section`: https://warehouse.readthedocs.io/development/getting-started/#running-tests-and-linters
5559
.. _BrowserStack: https://browserstack.com/
5660
.. _`supported browsers`: https://warehouse.readthedocs.io/development/frontend/#browser-support
5761
.. |BrowserStackImg| image:: docs/_static/browserstack-logo.png
5862
.. _BrowserStackImg: https://browserstack.com/
5963
.. _`PSF Code of Conduct`: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
64+
.. _`Libera`: https://web.libera.chat/#pypa,#pypa-dev
65+
.. _`PyPA Discord`: https://discord.gg/pypa
66+
.. _`Discourse`: https://discuss.python.org/c/packaging/14

docs/development/getting-started.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ improve the process:
2222

2323
- For bug reports or general problems, file an issue on `GitHub`_;
2424
- For real-time chat with other PyPA developers, join ``#pypa-dev`` `on
25-
Freenode`_;
25+
Libera`_;
2626
- For longer-form questions or discussion, message the `distutils-sig mailing
2727
list`_.
2828

@@ -628,7 +628,7 @@ Talk with us
628628
^^^^^^^^^^^^
629629

630630
You can find us via a `GitHub`_ issue, ``#pypa`` or ``#pypa-dev`` `on
631-
Freenode`_, or the `distutils-sig mailing list`_, to ask questions or get
631+
Libera`_, or the `distutils-sig mailing list`_, to ask questions or get
632632
involved. And you can meet us in person at `packaging sprints`_.
633633

634634
Learn about Warehouse and packaging
@@ -651,7 +651,7 @@ Resources to help you learn Warehouse's context:
651651
.. _`reStructured Text`: http://sphinx-doc.org/rest.html
652652
.. _`open issues that are labelled "good first issue"`: https://github.com/pypa/warehouse/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22
653653
.. _`GitHub`: https://github.com/pypa/warehouse
654-
.. _`on Freenode`: https://webchat.freenode.net/?channels=%23pypa-dev,pypa
654+
.. _`on Libera`: https://web.libera.chat/#pypa,#pypa-dev
655655
.. _`distutils-sig mailing list`: https://mail.python.org/mailman3/lists/distutils-sig.python.org/
656656
.. _`Test PyPI`: https://test.pypi.org/
657657
.. _`packaging sprints`: https://wiki.python.org/psf/PackagingSprints

docs/development/index.rst

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,14 @@ check out `"What to put in your bug report"`_ for guidance.
1414
GitHub issue tracker. Read the :ref:`security` documentation for
1515
details.
1616

17-
You can also join ``#pypa`` (general packaging discussion and user support) and
18-
``#pypa-dev`` (discussion about development of packaging tools) `on Freenode`_,
19-
or the `distutils-sig mailing list`_, to ask questions or get involved.
17+
Get involved or find help using:
18+
19+
- IRC: on `Libera`_, channel ``#pypa`` for general
20+
packaging discussion and user support,
21+
and ``#pypa-dev`` for discussions about development of packaging tools
22+
- The `PyPA Discord`_ for live discussions
23+
- The Packaging category on `Discourse`_ for
24+
discussing new ideas and community initiatives
2025

2126

2227
.. toctree::
@@ -36,5 +41,7 @@ or the `distutils-sig mailing list`_, to ask questions or get involved.
3641

3742
.. _`GitHub`: https://github.com/pypa/warehouse
3843
.. _`"What to put in your bug report"`: http://www.contribution-guide.org/#what-to-put-in-your-bug-report
39-
.. _`on Freenode`: https://webchat.freenode.net/?channels=%23pypa-dev,pypa
44+
.. _`Libera`: https://web.libera.chat/#pypa,#pypa-dev
45+
.. _`PyPA Discord`: https://discord.gg/pypa
46+
.. _`Discourse`: https://discuss.python.org/c/packaging/14
4047
.. _`distutils-sig mailing list`: https://mail.python.org/mailman3/lists/distutils-sig.python.org/

warehouse/locale/messages.pot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4773,7 +4773,7 @@ msgstr ""
47734773
msgid ""
47744774
"For help, go to <a href=\"%(irc_href)s\" title=\"%(title)s\" "
47754775
"target=\"_blank\" rel=\"noopener\">the <code>#pypa</code> IRC channel on "
4776-
"Freenode</a>, file an issue at <a href=\"%(issue_tracker_href)s\" "
4776+
"Libera</a>, file an issue at <a href=\"%(issue_tracker_href)s\" "
47774777
"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">pypa/packaging-"
47784778
"problems/issues</a>, or <a href=\"%(mailing_list_href)s\" "
47794779
"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">post to the "
@@ -5095,7 +5095,7 @@ msgid ""
50955095
" who work together to improve Python packaging. If you'd like to get in "
50965096
"touch with a core packaging developer, use <a href=\"%(irc_href)s\" "
50975097
"title=\"%(title)s\" target=\"_blank\" rel=\"noopener\">#pypa on IRC "
5098-
"(freenode)</a>, or <a href=\"%(discuss_href)s\" title=\"%(title)s\" "
5098+
"(Libera)</a>, or <a href=\"%(discuss_href)s\" title=\"%(title)s\" "
50995099
"target=\"_blank\" rel=\"noopener\">browse the online board</a>."
51005100
msgstr ""
51015101

warehouse/templates/pages/help.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -666,8 +666,8 @@ <h3 id="tls-deprecation">{{ tls_deprecation() }}</h3>
666666
<p>{% trans %}If you see an error like <code>There was a problem confirming the ssl certificate</code> or <code>tlsv1 alert protocol version</code> or <code>TLSV1_ALERT_PROTOCOL_VERSION</code>, you need to be connecting to PyPI with a newer TLS support library.{% endtrans %}</p>
667667
<p>{% trans %}The specific steps you need to take will depend on your operating system version, where your installation of Python originated (python.org, your OS vendor, or an intermediate distributor), and the installed versions of Python, <code>setuptools</code>, and <code>pip</code>.{% endtrans %}</p>
668668
<p>
669-
{% trans trimmed irc_href='https://webchat.freenode.net/?channels=%23pypa', issue_tracker_href='https://github.com/pypa/packaging-problems/issues', mailing_list_href='https://www.python.org/community/lists/', title=gettext('External link'), command='pip install --upgrade -vvv pip' %}
670-
For help, go to <a href="{{ irc_href }}" title="{{ title }}" target="_blank" rel="noopener">the <code>#pypa</code> IRC channel on Freenode</a>,
669+
{% trans trimmed irc_href='https://web.libera.chat/#pypa', issue_tracker_href='https://github.com/pypa/packaging-problems/issues', mailing_list_href='https://www.python.org/community/lists/', title=gettext('External link'), command='pip install --upgrade -vvv pip' %}
670+
For help, go to <a href="{{ irc_href }}" title="{{ title }}" target="_blank" rel="noopener">the <code>#pypa</code> IRC channel on Libera</a>,
671671
file an issue at <a href="{{ issue_tracker_href }}" title="{{ title }}" target="_blank" rel="noopener">pypa/packaging-problems/issues</a>,
672672
or <a href="{{ mailing_list_href }}" title="{{ title }}" target="_blank" rel="noopener">post to the python-help mailing list</a>,
673673
including your OS and installation details and the output of <code>{{ command }}</code>.
@@ -864,10 +864,10 @@ <h3>{% trans %}Resources{% endtrans %}</h3>
864864

865865
<h3>{% trans %}Contact{% endtrans %}</h3>
866866
<p>
867-
{% trans trimmed pypa_href='https://pypa.io', irc_href='https://webchat.freenode.net/?channels=%23pypa', discuss_href='https://discuss.python.org/c/packaging/14', title=gettext('External link') %}
867+
{% trans trimmed pypa_href='https://pypa.io', irc_href='https://web.libera.chat/#pypa', discuss_href='https://discuss.python.org/c/packaging/14', title=gettext('External link') %}
868868
The <a href="{{ pypa_href }}" title="{{ title }}" target="_blank" rel="noopener">Python Packaging Authority (PyPA)</a>
869869
is a working group who work together to improve Python packaging. If you'd like to get in touch with a core packaging developer,
870-
use <a href="{{ irc_href }}" title="{{ title }}" target="_blank" rel="noopener">#pypa on IRC (freenode)</a>,
870+
use <a href="{{ irc_href }}" title="{{ title }}" target="_blank" rel="noopener">#pypa on IRC (Libera)</a>,
871871
or <a href="{{ discuss_href }}" title="{{ title }}" target="_blank" rel="noopener">browse the online board</a>.
872872
{% endtrans %}
873873
</p>

0 commit comments

Comments
 (0)