Repository navigation
Conversation
aphearin
pushed a commit
to aphearin/halotools
that referenced
this pull request
Dec 18, 2016
…e is explicitly modified in-place in accord with astropy/astropy#5556. This change has previously been brought as part of astropy#637 by b28fe15. However, as that PR is entirely unrelated to this bugfix, astropy#637 will instead be rebased against this commit for clarity. Merging this PR will also resolve the test failures that occur in astropy#638. @bsipocz and/or @eteq - let me know if you know how to handle the git rewrite in a more elegant way (e.g., rolling back b28fe15), otherwise I'm fine with simply locally rebasing astropy#637, locally resolving the conflict, and then force-pushing astropy#637.
This was referenced Dec 18, 2016
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automated update of the astropy-helpers submodule to v1.3. This includes both the update of the astropy-helpers sub-module, and the
ah_bootstrap.pyfile, if needed.This is intended to be helpful, but if you would prefer to manage these updates yourself, or if you notice any issues with this automated update, please let @astrofrog know!