Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Upgrade pytest and -timeout #18722

Merged
merged 2 commits into from
Nov 26, 2018
Merged

Upgrade pytest and -timeout #18722

merged 2 commits into from
Nov 26, 2018

Conversation

scop
Copy link
Member

@scop scop commented Nov 26, 2018

Description:

https://docs.pytest.org/en/latest/changelog.html#pytest-4-0-1-2018-11-23
https://bitbucket.org/pytest-dev/pytest-timeout/commits/d29ad5ecbf94ae609a0af7f34a9cc8a900f0c075

Checklist:

  • The code change is tested and works locally.
  • Local tests pass with tox. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.

@homeassistant homeassistant added cla-signed small-pr PRs with less than 30 lines. labels Nov 26, 2018
@ghost ghost assigned scop Nov 26, 2018
@ghost ghost added the in progress label Nov 26, 2018
@balloob balloob merged commit b4e2f2a into home-assistant:dev Nov 26, 2018
@ghost ghost removed the in progress label Nov 26, 2018
@balloob
Copy link
Member

balloob commented Nov 26, 2018

No need to wait for approval for such PRs, you can just merge them.

@scop scop deleted the upgrade-pytest branch November 27, 2018 15:36
@balloob balloob mentioned this pull request Dec 12, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@scop scop

Labels
cla-signed small-pr PRs with less than 30 lines.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@scop @balloob @homeassistant