diff options
| -rw-r--r-- | Doc/distutils/setupscript.rst | 9 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst index 997dab7..a258e28 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 <http://pypi.python.org/pypi>`_. +(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. @@ -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 `$$` |