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

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

Merged
merged 1 commit into from Feb 20, 2015

Conversation

rgommers
Copy link
Member

No description provided.

@rgommers rgommers added Build issues Issues with building from source, including different choices of architecture, compilers and OS maintenance Items related to regular maintenance tasks labels Jan 27, 2015
@@ -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):

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.

@rgommers rgommers added this to the 0.16.0 milestone Jan 28, 2015
@rgommers
Copy link
Member Author

straightforward fix - going to merge this soon-ish

rgommers added a commit that referenced this pull request Feb 20, 2015
BLD: setup.py: update min numpy version and support "setup.py develop"
@rgommers rgommers merged commit 6774719 into scipy:master Feb 20, 2015
@rgommers rgommers deleted the setup-py-fixes branch February 20, 2015 07:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build issues Issues with building from source, including different choices of architecture, compilers and OS maintenance Items related to regular maintenance tasks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants