Merge branch '1.11' into 1.12

Conflicts:
	setup.py
This commit is contained in:
Jeff Forcier 2014-03-21 11:16:51 -07:00
commit a749c83aa8
1 changed files with 26 additions and 18 deletions

View File

@ -53,21 +53,29 @@ if sys.platform == 'darwin':
setup_helper.install_custom_make_tarball() setup_helper.install_custom_make_tarball()
setup(name = "paramiko", setup(
version = "1.12.3", name = "paramiko",
description = "SSH2 protocol library", version = "1.12.3",
author = "Jeff Forcier", description = "SSH2 protocol library",
author_email = "jeff@bitprophet.org", long_description = longdesc,
url = "https://github.com/paramiko/paramiko/", author = "Jeff Forcier",
packages = [ 'paramiko' ], author_email = "jeff@bitprophet.org",
license = 'LGPL', url = "https://github.com/paramiko/paramiko/",
platforms = 'Posix; MacOS X; Windows', packages = [ 'paramiko' ],
classifiers = [ 'Development Status :: 5 - Production/Stable', license = 'LGPL',
'Intended Audience :: Developers', platforms = 'Posix; MacOS X; Windows',
'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', classifiers = [
'Operating System :: OS Independent', 'Development Status :: 5 - Production/Stable',
'Topic :: Internet', 'Intended Audience :: Developers',
'Topic :: Security :: Cryptography' ], 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
long_description = longdesc, 'Operating System :: OS Independent',
**kw '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 :: 2 :: Only',
],
**kw
)