##// END OF EJS Templates
Merge pull request #12346 from meeseeksmachine/auto-backport-of-pr-12305-on-7.x...
Merge pull request #12346 from meeseeksmachine/auto-backport-of-pr-12305-on-7.x Backport PR #12305 on branch 7.x (Fix ipython#11508: check if line_buffer is None)

File last commit:

r25420:b1231d60
r25771:0cf8ac5a merge
Show More
pytest.ini
2 lines | 34 B | text/x-ini | IniLexer
Matthias Bussonnier
Also run test with Pytest....
r25117 [pytest]
Thomas A Caswell
MNT: update pytest.ini to work with pytest > 3
r25420 addopts = --durations=10