Merge master into features#6312
Merged
nicoddemus merged 31 commits intopytest-dev:featuresfrom Dec 3, 2019
Merged
Conversation
Use `dict.keys()` to work around `__iter__` not working with a multiprocessing DictProxy. Ref: python/cpython#17333 Fixes pytest-dev#6254. Ref: kevlened/pytest-parallel#36
…le-exit-exc-upstream main: wrap_session: handle exit.Exception with notify_exception
terminal: _get_main_color: help pytest-parallel
Co-Authored-By: Daniel Hahler <github@thequod.de>
Fix line detection for properties in doctest tests
Correct a typo in _pytest/config/__init__.py
`--keep-going` makes sense with `-W` to see all warnings/errors.
`{posargs:}` is useful for passing in custom args.
tox: docs: --keep-going and posargs
docs: add missing `log_cli` confval
Add link to testdir fixture in CHANGELOG entry
Preparing release version 5.3.1
Remove duplicated changelog entry for 5.3.1
Revert "A warning is now issued when assertions are made for `None`"
Now `tox -e docs` will also include the draft changelog for the next version (locally only). `CHANGELOG.rst` now only points to the changelog on READTHEDOCS so sphinx diretives can be used. Followup to pytest-dev#6272
…ev#6287) docs: move changelog to docs/en and allow sphinx directives
…-dev#6296) Ensure cache supporting files still exist after --cache-clear
Remove outdated py2py3 example
As discussed in pytest-dev#3342, this is the first step to make pytest support static typing fully
Convert pytest.py into a package
Fix typo in documentation of capfd fixture
Member
|
@nicoddemus we had that discussion on the ml, i didnt do the work yet on the version number auto-gen and the new contribution docs |
Member
Author
|
OK, thanks! |
Member
Author
|
Ready to merge, just waiting on approval. |
RonnyPfannschmidt
approved these changes
Dec 3, 2019
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
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.
Btw I can't find the discussion we had about no longer having a features branch... did we reach a conclusion there? 🤔