Skip to content

Commit

Permalink
Merge pull request #282 from flying-sheep/patch-1
Browse files Browse the repository at this point in the history
Always use setuptools if availabe
  • Loading branch information
minrk authored Aug 8, 2017
2 parents 086832c + f9bd264 commit fdf34a1
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
],
)

# require setuptools for these cases
if 'develop' in sys.argv or any(a.startswith('bdist') for a in sys.argv):
import setuptools

Expand All @@ -85,7 +86,12 @@
'test': ['ipykernel', 'ipython', 'mock', 'pytest'],
}

if 'setuptools' in sys.modules:
# always try to use setuptools if available
try:
import setuptools
except ImportError:
pass
else:
setup_args.update(setuptools_args)
setup_args['entry_points'] = {
'console_scripts': [
Expand Down

0 comments on commit fdf34a1

Please sign in to comment.