summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2017-06-12 09:45:18 -0700
committerJeff Forcier <jeff@bitprophet.org>2017-06-12 09:45:18 -0700
commit6ba72bca1047b6ed484f27e6adfbfce2f0909eb5 (patch)
treebcaac5cebef2312712126501638ff4a18bbb99a7
parentc2de25ff24c18771e12200a921017cb5e175bbc9 (diff)
parent44e0fa814c7bf5a81369c7ee5ff52d0662b4f457 (diff)
downloadparamiko-6ba72bca1047b6ed484f27e6adfbfce2f0909eb5.tar.gz
Merge branch '2.0' into 2.1
-rw-r--r--setup.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/setup.py b/setup.py
index 80d5ea7f..d3ab1ea9 100644
--- a/setup.py
+++ b/setup.py
@@ -72,6 +72,7 @@ setup(
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
],
install_requires=[
'cryptography>=1.1',