mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merged revisions 69861 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69861 | tarek.ziade | 2009-02-22 01:07:45 +0100 (Sun, 22 Feb 2009) | 1 line

  using versionchanged instead of versionadded for distutils doc on sdist default files
........
This commit is contained in:
Tarek Ziadé 2009-02-22 00:10:58 +00:00
parent ba86fa9d5f
commit c1a2657381
2 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Doc/distutils/setupscript.rst
View file

@ -450,10 +450,9 @@ way. From the PyXML setup script::
scripts=['scripts/xmlproc_parse', 'scripts/xmlproc_val'] scripts=['scripts/xmlproc_parse', 'scripts/xmlproc_val']
) )
All the scripts will also be added to the ``MANIFEST`` .. versionchanged:: 2.7
file if no template is provided. See :ref:`manifest`. All the scripts will also be added to the ``MANIFEST``
file if no template is provided. See :ref:`manifest`.
.. versionadded:: 2.7
.. _distutils-installing-package-data: .. _distutils-installing-package-data:
@ -498,10 +497,10 @@ The corresponding call to :func:`setup` might be::
) )
All the files that match ``package_data`` will be added to the ``MANIFEST`` .. versionchanged:: 2.7
file if no template is provided. See :ref:`manifest`. All the files that match ``package_data`` will be added to the ``MANIFEST``
file if no template is provided. See :ref:`manifest`.
.. versionadded:: 2.7
.. _distutils-additional-files: .. _distutils-additional-files:
@ -539,10 +538,10 @@ without specifying a target directory, but this is not recommended, and the
files directly in the target directory, an empty string should be given as the files directly in the target directory, an empty string should be given as the
directory. directory.
All the files that match ``data_files`` will be added to the ``MANIFEST`` .. versionchanged:: 2.7
file if no template is provided. See :ref:`manifest`. All the files that match ``data_files`` will be added to the ``MANIFEST``
file if no template is provided. See :ref:`manifest`.
.. versionadded:: 2.7
.. _meta-data: .. _meta-data:

5
Doc/distutils/sourcedist.rst
View file

@ -87,14 +87,9 @@ source distribution:
* all files that matches the ``package_data`` metadata. * all files that matches the ``package_data`` metadata.
See :ref:`distutils-installing-package-data`. See :ref:`distutils-installing-package-data`.
.. versionadded:: 2.7
* all files that matches the ``data_files`` metadata. * all files that matches the ``data_files`` metadata.
See :ref:`distutils-additional-files`. See :ref:`distutils-additional-files`.
.. versionadded:: 2.7
Sometimes this is enough, but usually you will want to specify additional files Sometimes this is enough, but usually you will want to specify additional files
to distribute. The typical way to do this is to write a *manifest template*, to distribute. The typical way to do this is to write a *manifest template*,
called :file:`MANIFEST.in` by default. The manifest template is just a list of called :file:`MANIFEST.in` by default. The manifest template is just a list of