summaryrefslogtreecommitdiff
path: root/docs/deprecated
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2022-05-09 10:28:14 -0400
committerJason R. Coombs <jaraco@jaraco.com>2022-05-10 07:47:52 -0400
commit7e3e58ce198d9319bb2279c2da4b1f298914d8a5 (patch)
tree1af3b0f99f5e37c47789bf93519392e08eb24094 /docs/deprecated
parente009a87b5578cb16099b697ba8395c8f6bdd70f3 (diff)
parenta7cfb56a7b1eaa95824d81a34e8e70b85d42f784 (diff)
downloadpython-setuptools-git-7e3e58ce198d9319bb2279c2da4b1f298914d8a5.tar.gz
Merge https://github.com/pypa/distutils into feature/distutils-a7cfb56a7b1eaa
Diffstat (limited to 'docs/deprecated')
-rw-r--r--docs/deprecated/distutils/examples.rst4
-rw-r--r--docs/deprecated/distutils/setupscript.rst6
2 files changed, 4 insertions, 6 deletions
diff --git a/docs/deprecated/distutils/examples.rst b/docs/deprecated/distutils/examples.rst
index d0984655..00eef73f 100644
--- a/docs/deprecated/distutils/examples.rst
+++ b/docs/deprecated/distutils/examples.rst
@@ -253,9 +253,7 @@ Running the ``check`` command will display some warnings:
$ python setup.py check
running check
- warning: check: missing required meta-data: version, url
- warning: check: missing meta-data: either (author and author_email) or
- (maintainer and maintainer_email) should be supplied
+ warning: check: missing required meta-data: version
If you use the reStructuredText syntax in the ``long_description`` field and
diff --git a/docs/deprecated/distutils/setupscript.rst b/docs/deprecated/distutils/setupscript.rst
index f49c4f89..ec9cf34e 100644
--- a/docs/deprecated/distutils/setupscript.rst
+++ b/docs/deprecated/distutils/setupscript.rst
@@ -582,7 +582,7 @@ This information includes:
| ``maintainer_email`` | email address of the | email address | \(3) |
| | package maintainer | | |
+----------------------+---------------------------+-----------------+--------+
-| ``url`` | home page for the package | URL | \(1) |
+| ``url`` | home page for the package | URL | |
+----------------------+---------------------------+-----------------+--------+
| ``description`` | short, summary | short string | |
| | description of the | | |
@@ -612,8 +612,8 @@ Notes:
It is recommended that versions take the form *major.minor[.patch[.sub]]*.
(3)
- Either the author or the maintainer must be identified. If maintainer is
- provided, distutils lists it as the author in :file:`PKG-INFO`.
+ If maintainer is provided and author is not, distutils lists maintainer as
+ the author in :file:`PKG-INFO`.
(4)
The ``long_description`` field is used by PyPI when you publish a package,