Skip to content

Commit

Permalink
Merge pull request #2891 from hugovk/update-docs-links
Browse files Browse the repository at this point in the history
Docs: Update setuptools.readthedocs.io to setuptools.pypa.io
  • Loading branch information
jaraco committed Nov 18, 2021
2 parents c65e338 + 02f0865 commit be0310d
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ body:
Have you tried to workaround the problem using other tools? Or a
different approach to solving this issue? Please elaborate here.
placeholder: >-
I tried doing X, Y and Z. But they are subobpimal because of P.
I tried doing X, Y and Z. But they are suboptimal because of P.
- type: textarea
attributes:
Expand Down
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- First time contributors: Take a moment to review https://setuptools.readthedocs.io/en/latest/development/developer-guide.html! -->
<!-- First time contributors: Take a moment to review https://setuptools.pypa.io/en/latest/development/developer-guide.html! -->
<!-- Remove sections if not applicable -->

## Summary of changes
Expand All @@ -15,4 +15,4 @@ Closes <!-- issue number here -->

[`changelog.d/`]: https://github.com/pypa/setuptools/tree/master/changelog.d
[PR docs]:
https://setuptools.readthedocs.io/en/latest/development/developer-guide.html#making-a-pull-request
https://setuptools.pypa.io/en/latest/development/developer-guide.html#making-a-pull-request
12 changes: 6 additions & 6 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2273,7 +2273,7 @@ v30.3.0

* #394 via #862: Added support for `declarative package
config in a setup.cfg file
<https://setuptools.readthedocs.io/en/latest/setuptools.html#configuring-setup-using-setup-cfg-files>`_.
<https://setuptools.pypa.io/en/latest/setuptools.html#configuring-setup-using-setup-cfg-files>`_.

v30.2.1
-------
Expand Down Expand Up @@ -2734,7 +2734,7 @@ v23.0.0
about, please comment in the ticket.
* #604: Removed docs building support. The project
now relies on documentation hosted at
https://setuptools.readthedocs.io/.
https://setuptools.pypa.io/.

v22.0.5
-------
Expand Down Expand Up @@ -2884,7 +2884,7 @@ v20.6.0
`semver <https://semver.org>`_ precisely.
The 'v' prefix on version numbers now also allows
version numbers to be referenced in the changelog,
e.g. http://setuptools.readthedocs.io/en/latest/history.html#v20-6-0.
e.g. http://setuptools.pypa.io/en/latest/history.html#v20-6-0.

20.5
----
Expand Down Expand Up @@ -2964,7 +2964,7 @@ v20.6.0

* Added support for using passwords from keyring in the upload
command. See `the upload docs
<https://setuptools.readthedocs.io/en/latest/setuptools.html#upload-upload-source-and-or-egg-distributions-to-pypi>`_
<https://setuptools.pypa.io/en/latest/setuptools.html#upload-upload-source-and-or-egg-distributions-to-pypi>`_
for details.

20.0
Expand Down Expand Up @@ -3718,7 +3718,7 @@ process to fail and PyPI uploads no longer accept files for 13.0.
---

* Added a `Developer Guide
<https://setuptools.readthedocs.io/en/latest/developer-guide.html>`_ to the official
<https://setuptools.pypa.io/en/latest/developer-guide.html>`_ to the official
documentation.
* Some code refactoring and cleanup was done with no intended behavioral
changes.
Expand Down Expand Up @@ -5425,7 +5425,7 @@ easy_install
* ``setuptools`` now finds its commands, ``setup()`` argument validators, and
metadata writers using entry points, so that they can be extended by
third-party packages. See `Creating distutils Extensions
<https://setuptools.readthedocs.io/en/latest/setuptools.html#creating-distutils-extensions>`_
<https://setuptools.pypa.io/en/latest/setuptools.html#creating-distutils-extensions>`_
for more details.

* The vestigial ``depends`` command has been removed. It was never finished
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
:alt: Code style: Black

.. image:: https://img.shields.io/readthedocs/setuptools/latest.svg
:target: https://setuptools.readthedocs.io
:target: https://setuptools.pypa.io

.. image:: https://img.shields.io/badge/skeleton-2021-informational
:target: https://blog.jaraco.com/skeleton
Expand Down
2 changes: 1 addition & 1 deletion docs/deprecated/distutils/_setuptools_disclaimer.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.. note::

This document is being retained solely until the ``setuptools`` documentation
at https://setuptools.readthedocs.io/en/latest/setuptools.html
at https://setuptools.pypa.io/en/latest/setuptools.html
independently covers all of the relevant information currently included here.
2 changes: 1 addition & 1 deletion docs/deprecated/distutils/apiref.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ API Reference
and other APIs, makes the API consistent across different Python versions,
and is hence recommended over using ``distutils`` directly.

.. _New and changed setup.py arguments in setuptools: https://setuptools.readthedocs.io/en/latest/setuptools.html#new-and-changed-setup-keywords
.. _New and changed setup.py arguments in setuptools: https://setuptools.pypa.io/en/latest/setuptools.html#new-and-changed-setup-keywords

.. include:: ./_setuptools_disclaimer.rst

Expand Down
2 changes: 1 addition & 1 deletion docs/development/developer-guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ To build the docs locally, use tox::
$ tox -e docs

.. _Sphinx: http://www.sphinx-doc.org/en/master/
.. _published documentation: https://setuptools.readthedocs.io/en/latest/
.. _published documentation: https://setuptools.pypa.io/en/latest/

---------------------
Vendored Dependencies
Expand Down
2 changes: 1 addition & 1 deletion pkg_resources/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1484,7 +1484,7 @@ def _fn(self, base, resource_name):
def _validate_resource_path(path):
"""
Validate the resource paths according to the docs.
https://setuptools.readthedocs.io/en/latest/pkg_resources.html#basic-resource-access
https://setuptools.pypa.io/en/latest/pkg_resources.html#basic-resource-access
>>> warned = getfixture('recwarn')
>>> warnings.simplefilter('always')
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ classifiers =
Topic :: Utilities
keywords = CPAN PyPI distutils eggs package management
project_urls =
Documentation = https://setuptools.readthedocs.io/
Documentation = https://setuptools.pypa.io/

[options]
packages = find_namespace:
Expand Down
6 changes: 3 additions & 3 deletions setuptools/command/easy_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
packages. For detailed documentation, see the accompanying EasyInstall.txt
file, or visit the `EasyInstall home page`__.
__ https://setuptools.readthedocs.io/en/latest/deprecated/easy_install.html
__ https://setuptools.pypa.io/en/latest/deprecated/easy_install.html
"""

Expand Down Expand Up @@ -519,7 +519,7 @@ def check_site_dir(self): # noqa: C901 # is too complex (12) # FIXME
For information on other options, you may wish to consult the
documentation at:
https://setuptools.readthedocs.io/en/latest/deprecated/easy_install.html
https://setuptools.pypa.io/en/latest/deprecated/easy_install.html
Please make the appropriate changes for your system and try again.
""").lstrip() # noqa
Expand Down Expand Up @@ -1312,7 +1312,7 @@ def byte_compile(self, to_compile):
* You can set up the installation directory to support ".pth" files by
using one of the approaches described here:
https://setuptools.readthedocs.io/en/latest/deprecated/easy_install.html#custom-installation-locations
https://setuptools.pypa.io/en/latest/deprecated/easy_install.html#custom-installation-locations
Please make the appropriate changes for your system and try again.
Expand Down

0 comments on commit be0310d

Please sign in to comment.