Skip to content

Merge master into features#6312

Merged
nicoddemus merged 31 commits intopytest-dev:featuresfrom
nicoddemus:mm
Dec 3, 2019
Merged

Merge master into features#6312
nicoddemus merged 31 commits intopytest-dev:featuresfrom
nicoddemus:mm

Conversation

@nicoddemus
Copy link
Member

Btw I can't find the discussion we had about no longer having a features branch... did we reach a conclusion there? 🤔

asottile and others added 30 commits November 19, 2019 08:24
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
As discussed in pytest-dev#3342, this
is the first step to make pytest support static typing fully
Fix typo in documentation of capfd fixture
@RonnyPfannschmidt
Copy link
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

@nicoddemus
Copy link
Member Author

OK, thanks!

@nicoddemus
Copy link
Member Author

Ready to merge, just waiting on approval.

@nicoddemus nicoddemus merged commit 985ac09 into pytest-dev:features Dec 3, 2019
@nicoddemus nicoddemus deleted the mm branch December 3, 2019 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants