summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeniz Taneli <7292227+dtaneli@users.noreply.github.com>2018-10-28 11:41:46 +0000
committerDeniz Taneli <7292227+dtaneli@users.noreply.github.com>2018-10-28 11:41:46 +0000
commit742457284db958bdf5efacde6e2b885c81247b27 (patch)
tree7c15baae6872085ef15bbe2eb297b0fcef8dcfbe
parent08bff86fe64cfb05d9ecd6dbf436fa706ecc8440 (diff)
downloadpython-setuptools-git-742457284db958bdf5efacde6e2b885c81247b27.tar.gz
Document the new `license_file` behaviour
-rw-r--r--changelog.d/1536.change.rst3
-rw-r--r--docs/setuptools.txt1
2 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/1536.change.rst b/changelog.d/1536.change.rst
new file mode 100644
index 00000000..8a69959c
--- /dev/null
+++ b/changelog.d/1536.change.rst
@@ -0,0 +1,3 @@
+``setuptools`` will now automatically include licenses if ``setup.cfg``
+contains a ``license_file`` attribute, unless this file is manually excluded
+inside ``MANIFEST.in``.
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index da9b0132..436f207d 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -2448,6 +2448,7 @@ maintainer str
maintainer_email maintainer-email str
classifiers classifier file:, list-comma
license file:, str
+license_file str
description summary file:, str
long_description long-description file:, str
long_description_content_type str