Feature master merge #1674
Closed
Feature master merge #1674
Conversation
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
…funcargvalue issue1625, rename getfuncargvalue to getfixturevalue
…lapse_false Fixes pytest-dev#1503 no longer collapse false explanations
I have came across this when noticing that universal-ctags fails to parse this correctly (universal-ctags/ctags#997).
This was added in b2d66b9 but is a bad idea. When a plugin can't be imported, commandline options (optionally set in pytest.ini) could be undefined, which means pytest bails out much earlier before showing the warning, which is hard to debug. Fixes pytest-dev#1479, also see pytest-dev#1307 and pytest-dev#1497
Combining multiple imports the "import pdb" imports the pytest module as opposed to the python debugger.
Don't ignore ImportError when importing setuptools plugins
Update website wrt indiegogo campaign
…epr__ Simplify Argument.__repr__
Add changelog entry for pytest-dev#1564
Rename the default plugin "pdb" into "debugging"
Conflicts: CHANGELOG.rst _pytest/doctest.py _pytest/python.py doc/en/announce/sprint2016.rst testing/cx_freeze/runtests_setup.py testing/python/fixture.py
|
Just wanted to (finally) review this and noticed it has new conflicts - can you merge the updated master again and resolve the new conflicts please? |
4 tasks
|
closing in favour of #1705 |
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.
No description provided.