mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-09 02:35:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 73441 via svnmerge from

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

........
  r73441 | tarek.ziade | 2009-06-16 09:29:52 +0200 (Tue, 16 Jun 2009) | 1 line

  Fixed #6287: documentation for the license field in distutils
........
This commit is contained in:
Tarek Ziadé 2009-06-16 07:43:42 +00:00
parent 693d804e27
commit 5e06a65639
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Doc/distutils/setupscript.rst
View file

@ -589,6 +589,8 @@ This information includes:
+----------------------+---------------------------+-----------------+--------+ +----------------------+---------------------------+-----------------+--------+
| ``platforms`` | a list of platforms | list of strings | | | ``platforms`` | a list of platforms | list of strings | |
+----------------------+---------------------------+-----------------+--------+ +----------------------+---------------------------+-----------------+--------+
| ``license`` | license for the package | short string | \(6) |
+----------------------+---------------------------+-----------------+--------+
Notes: Notes:
@ -610,6 +612,13 @@ Notes:
The ``long_description`` field is used by PyPI when you are registering a The ``long_description`` field is used by PyPI when you are registering a
package, to build its home page. package, to build its home page.
(6)
The ``license`` field is a text indicating the license covering the
package where the license is not a selection from the "License" Trove
classifiers. See the ``Classifier`` field. Notice that
there's a ``licence`` distribution option which is deprecated but still
acts as an alias for ``license``.
'short string' 'short string'
A single line of text, not more than 200 characters. A single line of text, not more than 200 characters.

2
Misc/NEWS
View file

@ -800,6 +800,8 @@ Core and Builtins
Library Library
------- -------
- Issue #6287: Added the license field in Distutils documentation.
- Issue #6263: Fixed syntax error in distutils.cygwincompiler. - Issue #6263: Fixed syntax error in distutils.cygwincompiler.
- Issue #5201: distutils.sysconfig.parse_makefile() now understands `$$` - Issue #5201: distutils.sysconfig.parse_makefile() now understands `$$`