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.

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

Merge master into features #5233

Merged
merged 25 commits into from May 9, 2019

Conversation

nicoddemus
Copy link
Member

No description provided.

mimi1vx and others added 21 commits April 4, 2019 13:14
> Black, your uncompromising #Python code formatter, was a project
> created with the community in mind from Day 1. Today we moved it under
> the PSF umbrella. It's now available on GitHub under
> https://github.com/python/black/ . You install and use it just like
> before.

https://twitter.com/llanga/status/1123980466292445190
Add links to pytest.raises `message` workaround
For pytest-dev#5208.

Document explicit behavior of `match` and brief note on how to handle matching a string that may contain special re chars.
 Clarify docs for pytest.raises `match`.
…pytest-dev#5222)

Restore usedevelop=True now that pip 19.1.1 restored the old behavior
…-dev#5045)

Skip test_source_mtime_long_long on 32bit and lower platforms
Pluggy 0.10.0 introduced a new dependency `importlib-metadata` but that
package cannot be imported when installed as an egg and that is causing
problems for users relying on `setup.py` to install packages present in
`test_require`. This change was quickly reverted in pluggy 0.11.0.

See pytest-dev/pluggy#205
@codecov
Copy link

codecov bot commented May 8, 2019

Codecov Report

Merging #5233 into features will decrease coverage by 1.46%.
The diff coverage is 87.5%.

Impacted file tree graph

@@             Coverage Diff              @@
##           features    #5233      +/-   ##
============================================
- Coverage     93.14%   91.68%   -1.47%     
============================================
  Files           115      115              
  Lines         26139    26138       -1     
  Branches       2578     2578              
============================================
- Hits          24348    23964     -384     
- Misses         1471     1852     +381     
- Partials        320      322       +2
Impacted Files Coverage Δ
src/_pytest/_code/code.py 95.49% <0%> (-0.01%) ⬇️
src/_pytest/assertion/rewrite.py 95.47% <100%> (ø) ⬆️
src/_pytest/python_api.py 97.47% <100%> (-0.02%) ⬇️
testing/test_assertrewrite.py 84.06% <100%> (+0.02%) ⬆️
testing/code/test_source.py 95.53% <100%> (ø) ⬆️
src/_pytest/recwarn.py 98.37% <100%> (ø) ⬆️
testing/test_session.py 24.05% <0%> (-75.95%) ⬇️
testing/test_runner_xunit.py 28.57% <0%> (-71.43%) ⬇️
testing/test_runner.py 34.7% <0%> (-61.61%) ⬇️
testing/test_resultlog.py 53.6% <0%> (-46.4%) ⬇️
... and 13 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ceca35b...ccf6c3c. Read the comment docs.

@blueyed
Copy link
Contributor

blueyed commented May 8, 2019

Azure down?

@nicoddemus
Copy link
Member Author

Not sure... weird that master has just passed on Azure. Seems to be a fluke.

Want me to push this again or can we trust on Travis? (I'm in for the latter)

@blueyed
Copy link
Contributor

blueyed commented May 8, 2019

No, please re-run / just wait.

@blueyed
Copy link
Contributor

blueyed commented May 8, 2019

(it is useful for later coverage comparison etc, based on this commit)

@nicoddemus
Copy link
Member Author

Pushed again, let's see

@nicoddemus
Copy link
Member Author

There it goes. 👍

Make sure we don't update to pluggy 1.0 automatically, as there are planned breaking
changes in the 1.0 release.
Copy link
Contributor

@blueyed blueyed left a comment

Choose a reason for hiding this comment

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

Has a conflict.

@nicoddemus
Copy link
Member Author

Thanks for the heads-up, fixed.

@nicoddemus nicoddemus merged commit 3a4a815 into pytest-dev:features May 9, 2019
@nicoddemus nicoddemus deleted the merge-master-into-features branch May 9, 2019 23:13
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.

None yet

8 participants