Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify setup.py by always relying on setuptools #729

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,10 @@
`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
Expand Down Expand Up @@ -89,5 +76,8 @@
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
],
**kw
install_requires=[
'pycrypto>=2.1,!=2.4',
'ecdsa>=0.11',
],
)