Skip to content

Fix continuous-integration/check.sh --only=pytest2 failing under pytest 3.10 #1117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2018

Conversation

Strilanc
Copy link
Contributor

@Strilanc Strilanc commented Nov 7, 2018

See also pytest-dev/pytest#4322
Fixes #1114

@googlebot googlebot added the cla: yes Makes googlebot stop complaining. label Nov 7, 2018
@Strilanc Strilanc changed the title Fix ./continuous-integration/check.sh --only=pytest2 failing under pytest 3.10 Fix continuous-integration/check.sh --only=pytest2 failing under pytest 3.10 Nov 7, 2018
Copy link
Collaborator

@viathor viathor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice find!

@Strilanc Strilanc added the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label Nov 7, 2018
@CirqBot
Copy link
Collaborator

CirqBot commented Nov 7, 2018

Automerge: started

@CirqBot CirqBot merged commit d721535 into master Nov 7, 2018
@CirqBot CirqBot deleted the fix_pytest2 branch November 7, 2018 02:42
@CirqBot
Copy link
Collaborator

CirqBot commented Nov 7, 2018

Automerge done.

@CirqBot CirqBot removed the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label Nov 7, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Makes googlebot stop complaining.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants