From: Tarek Ziadé Date: Tue, 16 Jun 2009 07:41:29 +0000 (+0000) Subject: Merged revisions 73441 via svnmerge from X-Git-Tag: v2.6.3rc1~196 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f85679ceea8ba57013027a280811d8c3b071c2d9;p=python Merged revisions 73441 via svnmerge from 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 ........ --- diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst index 997dab7fb3..a258e28bc8 100644 --- a/Doc/distutils/setupscript.rst +++ b/Doc/distutils/setupscript.rst @@ -565,6 +565,8 @@ This information includes: +----------------------+---------------------------+-----------------+--------+ | ``platforms`` | a list of platforms | list of strings | | +----------------------+---------------------------+-----------------+--------+ +| ``license`` | license for the package | short string | \(6) | ++----------------------+---------------------------+-----------------+--------+ Notes: @@ -582,6 +584,13 @@ Notes: versions prior to 2.2.3 or 2.3. The list is available from the `PyPI website `_. +(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' A single line of text, not more than 200 characters. diff --git a/Misc/NEWS b/Misc/NEWS index dcc2b81e8d..d31ea5dbe9 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -242,6 +242,8 @@ Core and Builtins Library ------- +- Issue #6287: Added the license field in Distutils documentation. + - Issue #6263: Fixed syntax error in distutils.cygwincompiler. - Issue #5201: distutils.sysconfig.parse_makefile() now understands `$$`