Merge master to features - one last time #6640
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
Makes `parent` a required arg, which would have failed before via `parent.session` anyway. Keeps calling/passing unused args for B/C.
Only copy'n'paste error from c416b1d.
Taken out of pytest-dev#6556.
Follow up to pytest-dev#6621 after premature merge
Use --wrap=preserve in release notes script
Package: typing, cleanup
Reword fixture docs for clarity
Fix typo
Not known with `curl` on Travis at least. Reverts pytest-dev#6573. This reverts commit df1f43e.
Revert "ci: codecov: use `--retry-connrefused` with curl"
typing: pytest_collection
This gets typically used always (via `getfixtureinfo`).
fixtures: move import of ParameterSet to top level
minor: doc: getfuncargnames: move TODO out of docstring
python: factor out async_warn
`-fE` is the default in `features` now [1], but the idea is to add `X` also to it in the long run, so let's dogfood it ourselves. 1: pytest-dev#6524 2: pytest-dev#6524 (comment)
tests: use `-rfEX`
|
Hmm I guess this needs to be approved, I didn't think of that 🤕 There were only trivial conflicts. To proceed with the other steps, if anyone sees this, please approve :) |
Typically good to add them with the merge commit message (i.e. uncomment what
I'm not sure if / how you want to proceed, but I'd like to at least you, @nicoddemus and @RonnyPfannschmidt to also approve that features should get merged into master as-is really (#6571 (comment)). |
blueyed
approved these changes
Jan 31, 2020
|
Thanks @blueyed, I think I will need to ping you for a few more steps... |
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.
Part of #6571 transition plan. I am doing this merge so that the reverse merge (coming up shortly) is clean.