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

Fix all() unroll for non-generators/non-list comprehensions #5360

Merged
merged 1 commit into from Jun 2, 2019
Merged

Fix all() unroll for non-generators/non-list comprehensions #5360

merged 1 commit into from Jun 2, 2019

Conversation

nicoddemus
Copy link
Member

Fix #5358

@nicoddemus nicoddemus added the needs backport applied to PRs, indicates that it should be ported to the current bug-fix branch label Jun 2, 2019
@codecov
Copy link

codecov bot commented Jun 2, 2019 •
edited

Codecov Report

Merging #5360 into master will decrease coverage by 1.8%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5360      +/-   ##
==========================================
- Coverage   94.34%   92.53%   -1.81%     
==========================================
  Files         115      115              
  Lines       26391    26399       +8     
  Branches     2607     2606       -1     
==========================================
- Hits        24899    24429     -470     
- Misses       1180     1643     +463     
- Partials      312      327      +15
Impacted Files Coverage Δ
src/_pytest/assertion/rewrite.py 95.85% <100%> (+0.31%) ⬆️
testing/test_assertrewrite.py 84.46% <100%> (+0.17%) ⬆️
testing/logging/test_reporting.py 21.03% <0%> (-78.97%) ⬇️
testing/examples/test_issue519.py 33.33% <0%> (-66.67%) ⬇️
testing/python/collect.py 70.19% <0%> (-29.18%) ⬇️
testing/python/metafunc.py 81.38% <0%> (-13.54%) ⬇️
testing/test_warnings.py 49.18% <0%> (-9.29%) ⬇️
src/_pytest/logging.py 86.95% <0%> (-9.01%) ⬇️
testing/python/fixtures.py 71.5% <0%> (-7.84%) ⬇️
testing/logging/test_fixture.py 93.1% <0%> (-6.9%) ⬇️
... and 9 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 e4fe41e...acdf30a. Read the comment docs.

asottile
asottile approved these changes Jun 2, 2019
View reviewed changes
Copy link
Member

@asottile asottile left a comment

Choose a reason for hiding this comment

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

@asottile
Copy link
Member

asottile commented Jun 2, 2019

I can backport this one, I want to try a different procedure and write some stuff up so it's less mysterious

@nicoddemus
Copy link
Member Author

I can backport this one

Sure, please go ahead! 👍 😁

@nicoddemus
Copy link
Member Author

btw I think we need to make a 4.6.1 release with this fix, as it simply breaks the entire test run and without a clear workaround other than disabling assertion rewriting entirely.

@asottile
Copy link
Member

asottile commented Jun 2, 2019

happy to do that as well 👍 -- shall I release from master or should we try our first release from the maintenance branch?

@nicoddemus
Copy link
Member Author

shall I release from master or should we try our first release from the maintenance branch?

Let's do it from the maintenance branch. 👍

@nicoddemus nicoddemus merged commit 733f43b into pytest-dev:master Jun 2, 2019
@nicoddemus nicoddemus deleted the fix-all-unroll branch June 2, 2019 15:51
asottile added a commit that referenced this pull request Jun 2, 2019
@asottile
Merge pull request #5361 from asottile/backport_5360
8208a37 
[4.6] Fix all() unroll for non-generators/non-list comprehensions (#5360)
blueyed added a commit to blueyed/pytest that referenced this pull request Jun 2, 2019
@blueyed
Revert "ci: Travis: add pypy3 to allowed failures temporarily"
a6dc283 
This reverts commit 5ac498e.

The idea is that maybe pytest-dev#5360
fixes the failures here also.
@blueyed blueyed mentioned this pull request Jun 2, 2019
Merged
@rouge8 rouge8 mentioned this pull request Jun 3, 2019
Open
@asottile asottile added backported PR has been backported to the current bug-fix branch and removed needs backport applied to PRs, indicates that it should be ported to the current bug-fix branch labels Jun 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asottile asottile asottile approved these changes

Assignees
No one assigned
Labels
backported PR has been backported to the current bug-fix branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

pytest 4.6.0 breaks matplotlib test gathering with TypeError: cannot unpack non-iterable NoneType object
2 participants
@nicoddemus @asottile