summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-10-18 11:57:02 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-10-18 11:57:02 -0700
commit4370b106a985e9eb41966d01acc0043ed7caddad (patch)
tree8e6a52a1cca71b7065ce9ccf86c0d64fbe8fb819
parenta1e432e80bf221e527f3dbb6ee79cecfb10871a2 (diff)
parent71608fd6615ab88ab9ca5b3a8ad1e89a342afd58 (diff)
downloadparamiko-4370b106a985e9eb41966d01acc0043ed7caddad.tar.gz
Merge branch '2.2' into 2.3
-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 9b154c24..2016d872 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.3.1 <2017-09-22>`
* :bug:`1071` Certificate support broke the no-certificate case for Ed25519
keys (symptom is an ``AttributeError`` about ``public_blob``.) This went