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

Release 4.6.0 #5350

Merged
merged 69 commits into from Jun 1, 2019
Merged

Release 4.6.0 #5350

merged 69 commits into from Jun 1, 2019

Conversation

asottile
Copy link
Member

🎉 🎆 🎉 🎆 🎉

jeffreyrack and others added 30 commits April 4, 2019 20:26
Merge master into features
It was not really testing what it was supposed to test (e.g. the inner
test was not run in the first place).
Merge master to fix CI
Merge master into features (make CI green again)
This can provide useful information, e.g.

> could not import 'pyrepl.readline': curses library not found
Do not cut long help texts, but wrap them the same way as argparse wraps
the other help items.
importorskip: display/include ImportError
tests: fix test_trace_after_runpytest
tests: harden test_nonascii_text
Improve output of ini options in --help
This reverts commit 043fdb7.
These tests were part of the PR #5155 but weren't relevant to #5602
…ting

The code
```
x = 0
assert x == 1
```
will give the failure message 0 == 1, so it shouldn't be different as
part of an unroll
@codecov
Copy link

codecov bot commented May 31, 2019

Codecov Report

Merging #5350 into master will decrease coverage by 3.44%.
The diff coverage is 90.93%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5350      +/-   ##
==========================================
- Coverage   94.12%   90.67%   -3.45%     
==========================================
  Files         115      115              
  Lines       26303    26384      +81     
  Branches     2592     2607      +15     
==========================================
- Hits        24757    23923     -834     
- Misses       1229     2129     +900     
- Partials      317      332      +15
Impacted Files Coverage Δ
testing/test_session.py 100% <ø> (ø) ⬆️
src/_pytest/compat.py 96.98% <ø> (-0.02%) ⬇️
testing/test_terminal.py 94.4% <100%> (-5.14%) ⬇️
src/_pytest/config/__init__.py 93.79% <100%> (-0.01%) ⬇️
testing/test_pytester.py 55.21% <100%> (-27.45%) ⬇️
src/_pytest/pytester.py 85.31% <100%> (-4.5%) ⬇️
src/_pytest/fixtures.py 97.55% <100%> (ø) ⬆️
testing/test_junitxml.py 97.96% <100%> (+0.02%) ⬆️
src/_pytest/junitxml.py 95.9% <100%> (+0.04%) ⬆️
testing/test_assertion.py 97.67% <100%> (ø) ⬆️
... and 36 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 f360147...e7cd00a. Read the comment docs.

Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

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

🎉

CHANGELOG.rst Show resolved Hide resolved
@asottile
Copy link
Member Author

@nicoddemus an idea why codecov/patch hasn't reported? can I ignore that and continue?

@nicoddemus
Copy link
Member

@nicoddemus an idea why codecov/patch hasn't reported? can I ignore that and continue?

No idea why, but let's wait for @blueyed's review regardless. 👍

@blueyed blueyed closed this May 31, 2019
@blueyed blueyed reopened this May 31, 2019
@blueyed
Copy link
Contributor

blueyed commented May 31, 2019

Codecov likely got confused (reported -4% drop at https://codecov.io/gh/pytest-dev/pytest/pull/5350/changes).
(I can imagine this happens when the merge commit advanced already or something like that (similar to how Travis does not build the actual commit to be tested when you push a new commit before it gets to this job))

CHANGELOG.rst Outdated Show resolved Hide resolved
CHANGELOG.rst Outdated Show resolved Hide resolved
CHANGELOG.rst Outdated Show resolved Hide resolved
CHANGELOG.rst Outdated Show resolved Hide resolved
CHANGELOG.rst Outdated Show resolved Hide resolved
@blueyed
Copy link
Contributor

blueyed commented May 31, 2019

I'd say to wait for CI to pass before rebasing this for fixed changelogs (with regard to codecov).

@nicoddemus
Copy link
Member

Ready for the release! 🎉

@asottile asottile merged commit 917195e into pytest-dev:master Jun 1, 2019
@asottile asottile deleted the release-4.6.0 branch June 1, 2019 18:11
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

7 participants