Merge master into features #1554
Merged
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
The example output shown was for Python3 not Python2. Add Python2 output and rephrase for clarity.
The feature has been there for a long time and in the 2.7.1 release notes it says: > fixed docs to remove the notion that yield-fixtures are experimental. Therefore this one place was probably just missed.
The fin() function was never added as a finalizer and did therefore not print anything in the captured output. In general improve the output by making it more verbose/explicit and extend the final explanation.
Since 'py.test --help' shows --trace-config as an option (and not --traceconfig) even though both forms are accepted I assume --trace-config is the preferred form and should therefore be used in the documentation.
Since 'py.test --help' shows --full-trace as an option (and not --fulltrace) even though both forms are accepted I assume --full-trace is the preferred form and should therefore be used in the documentation.
Fix pytest.mark.skip mark when used in strict mode
Mention Pytest::Framework PyPI classifier on docs
Adapt get_issues.py script for GitHub (instead of Bitbucket)
Always lstrip() keyword expression
Hudson -> Jenkins
Avoid errors `UnicodeErrosr`s due non maximum recursion depth errors when checking for those errors.
…h-unicode Fix `repr_traceback` to work with unicode errors
LaTeX doesn't like those particular unicode chars, so let's avoid them so the PDF builds easily.
doc: Use ascii chars for file tree
The TracebackItem class does not exist, but it seems the docstrings refer to TracebackEntry.
Fix pytest-dev#1549 - count skips in junit-xml
|
the py26 failures seem to stem from the recent pip update |
|
Yep, looks like https://bitbucket.org/hpk42/tox/issues/332/ / pypa/pip#3667 |
|
Should we just remove that comment from the |
|
We can also set |
…rojects As per their email ‘Changes to project subdomains’: > Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard. Test Plan: Manually visited all the links I’ve modified. One was not modified - `http://media.readthedocs.org/epub/pytest/latest/pytest.epub` - since it doesn't work on `readthedocs.io`.
Convert readthedocs link for their .org -> .io migration for hosted projects
This was referenced May 18, 2016
Move comment in tox.ini due to recent bug in pip
|
Hey @RonnyPfannschmidt, could you please get the new changes from |
|
done, pushing after local tox |
|
Hmm strange, it seems |
This fixes the bug inserted by accident in pytest-dev#1523
|
Please check solution for |
Fix shell argument split in win32
|
Thanks @RonnyPfannschmidt! |
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 was done as series of merge commits to ease conflict resolution