Skip to content

Fix bug in resolve_name resulting in duplicate imports of numpy (or other packages) - #4084

Merged
embray merged 2 commits into
astropy:masterfrom
embray:utils/resolve-name-fromlist-bug
Aug 17, 2015
Merged

embray merged 2 commits into
astropy:masterfrom
embray:utils/resolve-name-fromlist-bug

Conversation

@embray

@embray embray commented Aug 17, 2015

Copy link
Copy Markdown
Member

This fixes the bug that was originally fixed in #4083, but which has now been split off to a separate PR since it should be fixed for the v1.0.x branch.

embray added 2 commits August 17, 2015 17:37
…mporting a top-level module (like 'numpy') things could go seriously awry with the import system (this itself is a bug in Python 2).
@embray

embray commented Aug 17, 2015

Copy link
Copy Markdown
Member Author

CI doesn't want to run on this PR due to it being pushed with a "skip ci" commit at the end =_= However, this was already tested in the build run for #4083 which was successful: https://travis-ci.org/astropy/astropy/builds/76005979

embray added a commit that referenced this pull request Aug 17, 2015
Fix bug in resolve_name resulting in duplicate imports of numpy (or other packages)
@embray
embray merged commit 02bd5b0 into astropy:master Aug 17, 2015
@embray
embray deleted the utils/resolve-name-fromlist-bug branch August 17, 2015 21:44
embray added a commit that referenced this pull request Sep 18, 2015
Fix bug in resolve_name resulting in duplicate imports of numpy (or other packages)
Conflicts:
	astropy/tests/pytest_plugins.py
dhomeier pushed a commit to dhomeier/astropy that referenced this pull request Dec 17, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant