BUG: fence pytest import in tomo testutils #982
Merged
Conversation
This file contains 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
adler-j
reviewed
Apr 20, 2017
odl/tomo/util/testutils.py
Outdated
| # Make trivial decorator | ||
| from odl.util import OptionalArgDecorator | ||
|
|
||
| class ident(OptionalArgDecorator): |
There was a problem hiding this comment.
Why would we need to overwrite this, shouldn't this be the default implementation?
There was a problem hiding this comment.
You mean the _wrapper? That would make sense, yes.
|
Needs approval |
adler-j
approved these changes
Apr 20, 2017
odl/tomo/util/testutils.py
Outdated
|
|
||
| skip_if_no_astra = pytest.mark.skipif("not odl.tomo.ASTRA_AVAILABLE", | ||
| reason='ASTRA not available') | ||
| class ident(OptionalArgDecorator): |
There was a problem hiding this comment.
Why even do this? Instead do
from odl.util import OptionalArgDecorator as ident
Fix in other places as well
kohr-h
force-pushed
the
fix_pytest_import
branch
from
94c3d28
to
dc9c119
Compare
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.
Another thing that needs last-minute fix. Import in a new environment without
pytestinstalled would fail.