From: Tarek Ziadé Date: Tue, 16 Jun 2009 07:45:39 +0000 (+0000) Subject: Merged revisions 73443 via svnmerge from X-Git-Tag: 3.0~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37c12b411261487bcdfd96f1beb0f9b2cc45b1f4;p=thirdparty%2FPython%2Fcpython.git Merged revisions 73443 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r73443 | tarek.ziade | 2009-06-16 09:43:42 +0200 (Tue, 16 Jun 2009) | 9 lines 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 666b7d627403..59c9b83f9cb1 100644 --- a/Doc/distutils/setupscript.rst +++ b/Doc/distutils/setupscript.rst @@ -563,6 +563,8 @@ This information includes: +----------------------+---------------------------+-----------------+--------+ | ``platforms`` | a list of platforms | list of strings | | +----------------------+---------------------------+-----------------+--------+ +| ``license`` | license for the package | short string | \(6) | ++----------------------+---------------------------+-----------------+--------+ Notes: @@ -580,6 +582,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 bc3f41d2e26a..1b61ff7506eb 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -330,6 +330,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 `$$`