cpython: 7583d65da2ad (original) (raw)

Mercurial > cpython

changeset 101759:7583d65da2ad

Issue #26014: merge from 3.5 [#26014]

Ned Deily nad@python.org
date	Sun, 05 Jun 2016 17:39:58 -0700
parents	470954641f3b(current diff)f5fd646b265b(diff)
children	166784c40be8
files	Misc/NEWS
diffstat	5 files changed, 16 insertions(+), 3 deletions(-)[+] [-] Doc/distributing/index.rst 2 Doc/distutils/index.rst 6 Doc/install/index.rst 5 Doc/library/distutils.rst 2 Misc/NEWS 4

line wrap: on

line diff

--- a/Doc/distributing/index.rst +++ b/Doc/distributing/index.rst @@ -61,7 +61,7 @@ Key terms extensions, to be installed on a system without needing to be built locally. -.. _setuptools: https://setuptools.pypa.io/en/latest/setuptools.html[](#l1.7) +.. _setuptools: https://setuptools.readthedocs.io/en/latest/[](#l1.8) .. _wheel: https://wheel.readthedocs.org[](#l1.9) Open source licensing and collaboration

--- a/Doc/distutils/index.rst +++ b/Doc/distutils/index.rst @@ -7,6 +7,11 @@ :Authors: Greg Ward, Anthony Baxter :Email: distutils-sig@python.org +.. seealso:: +

:ref:distributing-index

 The up to date module distribution documentations[](#l2.10)

+ This document describes the Python Distribution Utilities ("Distutils") from the module developer's point of view, describing how to use the Distutils to make Python modules and extensions easily available to a wider audience with @@ -20,7 +25,6 @@ very little overhead for build/release/i recommendations section https://packaging.python.org/en/latest/current/`__ in the Python Packaging User Guide for more information. - .. toctree:: :maxdepth: 2 :numbered:

--- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -10,6 +10,11 @@ .. TODO: Fill in XXX comments +.. seealso:: +

:ref:installing-index

 The up to date module installation documentations[](#l3.10)

+ .. The audience for this document includes people who don't know anything about Python and aren't about to learn the language just in order to install and maintain it for their users, i.e. system administrators.

--- a/Doc/library/distutils.rst +++ b/Doc/library/distutils.rst @@ -15,7 +15,7 @@ collections of Python packages which inc Most Python users will not want to use this module directly, but instead use the cross-version tools maintained by the Python Packaging Authority. In particular, -setuptools <https://setuptools.pypa.io/en/latest/setuptools.html>__ is an +setuptools <https://setuptools.readthedocs.io/en/latest/>__ is an enhanced alternative to :mod:distutils that provides:

support for declaring project dependencies

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -1258,6 +1258,10 @@ Documentation

Issue #24952: Clarify the default size argument of stack_size() in the "threading" and "_thread" modules. Patch from Mattip. +- Issue #26014: Update 3.x packaging documentation:

- "See also" links to the new docs are now provided in the legacy pages
- links to setuptools documentation have been updated + Tests -----