From 76a14eddc6796c264d45d8069c8f02345a855624 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sat, 23 Apr 2016 13:53:07 -0400 Subject: Simplify setup.py by always relying on setuptools It is installed everywhere now, there is no practical way to use python without it. --- setup.py | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/setup.py b/setup.py index f9c4b4fe..ad957329 100644 --- a/setup.py +++ b/setup.py @@ -31,23 +31,10 @@ To install the `in-development version `pip install paramiko==dev`. ''' -# if someday we want to *require* setuptools, uncomment this: -# (it will cause setuptools to be automatically downloaded) -#import ez_setup -#ez_setup.use_setuptools() - import sys -try: - from setuptools import setup - kw = { - 'install_requires': [ - 'pycrypto>=2.1,!=2.4', - 'ecdsa>=0.11', - ], - } -except ImportError: - from distutils.core import setup - kw = {} + +from setuptools import setup + if sys.platform == 'darwin': import setup_helper @@ -89,5 +76,8 @@ setup( 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', ], - **kw + install_requires=[ + 'pycrypto>=2.1,!=2.4', + 'ecdsa>=0.11', + ], ) -- cgit v1.2.3 From 06ef0e97eaa9767c2a799d231ae28c1c86418a7d Mon Sep 17 00:00:00 2001 From: Jeff Forcier Date: Sun, 24 Apr 2016 19:02:33 -0700 Subject: Changelog closes #729 --- sites/www/changelog.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index feef1c9b..b9d8b28e 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,6 +2,9 @@ Changelog ========= +* :support:`729 backported` Clean up ``setup.py`` to always use ``setuptools``, + not doing so was a historical artifact from bygone days. Thanks to Alex + Gaynor. * :support:`621 backported` Annotate some public attributes on `~paramiko.channel.Channel` such as ``.closed``. Thanks to Sergey Vasilyev for the report. -- cgit v1.2.3