summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-10-18 11:56:36 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-10-18 11:56:36 -0700
commit05fcd2e8f56c7b33693283c74909515a461ef650 (patch)
treeb59826b57b4a83a8cb7cde0d4695b9cd9bd16773
parent24ea6d2f3d76d3c23eac3cb3f83e767ef8fa5f59 (diff)
parenta4b17ac6bc499e97e9227d092e7f002b43d06819 (diff)
downloadparamiko-05fcd2e8f56c7b33693283c74909515a461ef650.tar.gz
Merge branch '2.0' into 2.1
-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 63793ea2..011b3098 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.1.4 <2017-09-18>`
* :release:`2.0.7 <2017-09-18>`
* :release:`1.18.4 <2017-09-18>`