summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Ganssle <pganssle@users.noreply.github.com>2018-10-27 12:42:43 -0400
committerGitHub <noreply@github.com>2018-10-27 12:42:43 -0400
commit1b98bc206c7f46be3216e2b91f4f07d93b61dd0c (patch)
tree99a546e2fd79c9171daeef0c4d73abace00913b2
parent56a7c4436e6370ae369f89cd6cef9294d03af8a2 (diff)
parente97921f0b885d07f21276c9e416418f8bc16aaaa (diff)
downloadpython-setuptools-git-1b98bc206c7f46be3216e2b91f4f07d93b61dd0c.tar.gz
Merge pull request #1539 from vitoace/content-description-doc-issue1236
Added minumum column in metadata table and version info for long_description_content_type
-rw-r--r--changelog.d/1539.doc.rst1
-rw-r--r--docs/setuptools.txt10
2 files changed, 6 insertions, 5 deletions
diff --git a/changelog.d/1539.doc.rst b/changelog.d/1539.doc.rst
new file mode 100644
index 00000000..220f6519
--- /dev/null
+++ b/changelog.d/1539.doc.rst
@@ -0,0 +1 @@
+Added minumum version column in ``setup.cfg`` metadata table.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index 46103b25..f2774b65 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2434,9 +2434,9 @@ Metadata
The aliases given below are supported for compatibility reasons,
but their use is not advised.
-============================== ================= =====
-Key Aliases Type
-============================== ================= =====
+============================== ================= ================= ===============
+Key Aliases Type Minumum Version
+============================== ================= ================= ===============
name str
version attr:, file:, str
url home-page str
@@ -2450,13 +2450,13 @@ classifiers classifier file:, list-comma
license file:, str
description summary file:, str
long_description long-description file:, str
-long_description_content_type str
+long_description_content_type str 38.6.0
keywords list-comma
platforms platform list-comma
provides list-comma
requires list-comma
obsoletes list-comma
-============================== ================= =====
+============================== ================= ================= ===============
.. note::
A version loaded using the ``file:`` directive must comply with PEP 440.