diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-21 11:20:59 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-21 11:20:59 -0700 |
| commit | a6b38ff5d2f4ceae2b74ef2c3f10aab56f65fc0f (patch) | |
| tree | 81c0f07236f0b4a4da0c1a611c19353d8f3fb336 | |
| parent | fe9171661a60b9299395c73630ebdbdc76fec342 (diff) | |
| parent | a749c83aa8cd47b7159d3dacebe2d62edb2b94e8 (diff) | |
Merge branch '1.12' into 1.13
Conflicts:
setup.py
| -rw-r--r-- | setup.py | 46 |
1 files changed, 28 insertions, 18 deletions
@@ -53,21 +53,31 @@ if sys.platform == 'darwin': setup_helper.install_custom_make_tarball() -setup(name = "paramiko", - version = "1.13.0", - description = "SSH2 protocol library", - author = "Jeff Forcier", - author_email = "jeff@bitprophet.org", - url = "https://github.com/paramiko/paramiko/", - packages = [ 'paramiko' ], - license = 'LGPL', - platforms = 'Posix; MacOS X; Windows', - classifiers = [ 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', - 'Operating System :: OS Independent', - 'Topic :: Internet', - 'Topic :: Security :: Cryptography' ], - long_description = longdesc, - **kw - ) +setup( + name = "paramiko", + version = "1.13.0", + description = "SSH2 protocol library", + long_description = longdesc, + author = "Jeff Forcier", + author_email = "jeff@bitprophet.org", + url = "https://github.com/paramiko/paramiko/", + packages = [ 'paramiko' ], + license = 'LGPL', + platforms = 'Posix; MacOS X; Windows', + classifiers = [ + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', + 'Operating System :: OS Independent', + 'Topic :: Internet', + 'Topic :: Security :: Cryptography', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.2', + 'Programming Language :: Python :: 3.3', + ], + **kw +) |