summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-10-18 11:56:45 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-10-18 11:56:45 -0700
commit71608fd6615ab88ab9ca5b3a8ad1e89a342afd58 (patch)
tree264d506aff706e7a8e2b1233d894606c582e08ba
parent1845168ecf034507cc00ea51837ea93cc440027e (diff)
parent05fcd2e8f56c7b33693283c74909515a461ef650 (diff)
Merge branch '2.1' into 2.2
-rw-r--r--setup.cfg3
-rw-r--r--sites/www/changelog.rst1
2 files changed, 4 insertions, 0 deletions
diff --git a/setup.cfg b/setup.cfg
index f2c1499d..8cc271fe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,9 @@
[wheel]
universal = 1
+[metadata]
+license_file = LICENSE
+
[coverage:run]
omit = paramiko/_winapi.py
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index 57911bfe..fe08b9dd 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,6 +2,7 @@
Changelog
=========
+* :support:`- backported` Include LICENSE file in wheel archives.
* :release:`2.2.2 <2017-09-18>`
* :release:`2.1.4 <2017-09-18>`
* :release:`2.0.7 <2017-09-18>`