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.

Sign up for GitHub

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

Jump to bottom

BLD: setup.py: update min numpy version and support "setup.py develop" #4475

Merged
merged 1 commit into from Feb 20, 2015
Merged

BLD: setup.py: update min numpy version and support "setup.py develop" #4475

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions setup.py
View file
Open in desktop
Expand Up @@ -195,7 +195,7 @@ def setup_package():
try:
import numpy
except:
build_requires = ['numpy>=1.5.1']
build_requires = ['numpy>=1.6.2']

metadata = dict(
name = 'scipy',
Expand Down Expand Up @@ -230,7 +230,8 @@ def setup_package():
FULLVERSION, GIT_REVISION = get_version_info()
metadata['version'] = FULLVERSION
else:
if len(sys.argv) >= 2 and sys.argv[1] == 'bdist_wheel':
if (len(sys.argv) >= 2 and sys.argv[1] == 'bdist_wheel') or (
'develop' in sys.argv):
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this change to develop go up in line 219?
sys.argv[1] in ('--help-commands', 'egg_info', '--version', 'clean', 'develop')
I think we want to avoid entering the else condition on line 232 completely, since this is the block that imports numpy.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No: running setup.py develop requires numpy.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The if clause above is only for a collection of commands that use setuptools but do not build scipy.

# bdist_wheel needs setuptools
import setuptools

Expand Down