Repository navigation
force freezing version to use log and skip odict when builtin in use - #5
Merged
Merged
Conversation
Owner
There was a problem hiding this comment.
This should be::
from ..tests.helper import pytest
or something similar (which uses the real pytest if installed, or the bundled one if not). You may have to tweak the relative path.
Author
There was a problem hiding this comment.
Ah, you're so close - it needed three dots instead of two :)
Owner
|
Thanks! |
astrofrog
added a commit
that referenced
this pull request
Oct 21, 2011
force freezing version to use log and skip odict when builtin in use
astrofrog
pushed a commit
that referenced
this pull request
Dec 7, 2012
…ng manual conflict resolutions
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
2 participants
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 does the two things I mentioned in the astropy repo pull request - uses the
distutils.log.infomechanism withdistutils.log.set_thresholdto make it actually be visible, and skips all the odict tests for python versions >=2.7 (for which OrderedDict is in teh standardlib, and the astropy odict just gives the standard object).Note that I have do a little check to see if '-q' or '--quiet' is at the command line because that should supress messages in setup... but because the version number freeze comes before setup.py, I just use the sort of dumb way of looking directly for the arguments.