Skip to content

Commit 8329a72

Browse files
committed
Core metadata: move License into the "Deprecated Fields" section
It's currently in the main section despite being deprecated.
1 parent b1bbf69 commit 8329a72

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

source/specifications/core-metadata.rst

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -439,38 +439,6 @@ addresses::
439439
Maintainer-email: cschultz@example.com, snoopy@peanuts.com
440440

441441

442-
.. _license-optional:
443-
.. _core-metadata-license:
444-
445-
License
446-
=======
447-
448-
.. versionadded:: 1.0
449-
.. deprecated:: 2.4
450-
in favour of ``License-Expression``.
451-
452-
.. warning::
453-
As of Metadata 2.4, ``License`` and ``License-Expression`` are mutually
454-
exclusive. If both are specified, tools which parse metadata will disregard
455-
``License`` and PyPI will reject uploads.
456-
See `PEP 639 <https://peps.python.org/pep-0639/#deprecate-license-field>`__.
457-
458-
Text indicating the license covering the distribution where the license
459-
is not a selection from the "License" Trove classifiers. See
460-
:ref:`"Classifier" <metadata-classifier>` below.
461-
This field may also be used to specify a
462-
particular version of a license which is named via the ``Classifier``
463-
field, or to indicate a variation or exception to such a license.
464-
465-
Examples::
466-
467-
License: This software may only be obtained by sending the
468-
author a postcard, and then the user promises not
469-
to redistribute it.
470-
471-
License: GPL version 3, excluding DRM provisions
472-
473-
474442
.. _license-expression-optional:
475443
.. _core-metadata-license-expression:
476444

@@ -1031,6 +999,38 @@ Example::
1031999
Obsoletes: Gorgon
10321000

10331001

1002+
.. _license-optional:
1003+
.. _core-metadata-license:
1004+
1005+
License
1006+
-------
1007+
1008+
.. versionadded:: 1.0
1009+
.. deprecated:: 2.4
1010+
in favour of ``License-Expression``.
1011+
1012+
.. warning::
1013+
As of Metadata 2.4, ``License`` and ``License-Expression`` are mutually
1014+
exclusive. If both are specified, tools which parse metadata will disregard
1015+
``License`` and PyPI will reject uploads.
1016+
See `PEP 639 <https://peps.python.org/pep-0639/#deprecate-license-field>`__.
1017+
1018+
Text indicating the license covering the distribution where the license
1019+
is not a selection from the "License" Trove classifiers. See
1020+
:ref:`"Classifier" <metadata-classifier>` below.
1021+
This field may also be used to specify a
1022+
particular version of a license which is named via the ``Classifier``
1023+
field, or to indicate a variation or exception to such a license.
1024+
1025+
Examples::
1026+
1027+
License: This software may only be obtained by sending the
1028+
author a postcard, and then the user promises not
1029+
to redistribute it.
1030+
1031+
License: GPL version 3, excluding DRM provisions
1032+
1033+
10341034
History
10351035
=======
10361036

0 commit comments

Comments
 (0)