Skip to content

Merge master into features - #6111

Merged
blueyed merged 12 commits into
pytest-dev:featuresfrom
blueyed:merge-master-into-features
Nov 7, 2019
Merged

Merge master into features#6111
blueyed merged 12 commits into
pytest-dev:featuresfrom
blueyed:merge-master-into-features

Conversation

@blueyed

@blueyed blueyed commented Nov 1, 2019

Copy link
Copy Markdown
Contributor

No description provided.

davidszotten and others added 2 commits October 31, 2019 21:41
Without this, the second time it tries to stop in a parametrized
function it raises instead:

`ValueError: --trace can't be used with a fixture named func!`

Implementation idea, test (and changelog tweaks) thanks to blueyed

Co-Authored-By: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Co-Authored-By: Daniel Hahler <git@thequod.de>
@blueyed
blueyed changed the base branch from master to features November 1, 2019 04:08
@blueyed blueyed closed this Nov 1, 2019
@blueyed
blueyed deleted the merge-master-into-features branch November 1, 2019 11:40
@blueyed
blueyed restored the merge-master-into-features branch November 6, 2019 13:20
@blueyed blueyed reopened this Nov 6, 2019
Conflicts:
	src/_pytest/debugging.py
@blueyed
blueyed force-pushed the merge-master-into-features branch from 0d40727 to 4e45472 Compare November 6, 2019 13:22
@nicoddemus

Copy link
Copy Markdown
Member

Probably better to start over. 👍

@blueyed

blueyed commented Nov 6, 2019

Copy link
Copy Markdown
Contributor Author

I've updated it.
Fails because of colors.
I've only want to have the py38 check really, but is not strictly necessary.
#6121 would help here (I've done that in my fork).

But of course I can also just update the test.

@blueyed
blueyed merged commit b268463 into pytest-dev:features Nov 7, 2019
@blueyed
blueyed deleted the merge-master-into-features branch November 7, 2019 11:31
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.

5 participants