Skip to content

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

Merged
nicoddemus merged 1 commit into
pytest-dev:masterfrom
nicoddemus:fix-all-unroll
Jun 2, 2019
Merged

Fix all() unroll for non-generators/non-list comprehensions#5360
nicoddemus merged 1 commit into
pytest-dev:masterfrom
nicoddemus:fix-all-unroll

Conversation

@nicoddemus

@nicoddemus nicoddemus commented Jun 2, 2019

Copy link
Copy Markdown
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

codecov Bot commented Jun 2, 2019 •
edited
Loading

Copy link
Copy Markdown

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 reviewed Jun 2, 2019
View reviewed changes
Comment thread src/_pytest/assertion/rewrite.py Outdated
asottile
asottile reviewed Jun 2, 2019
View reviewed changes
Comment thread src/_pytest/assertion/rewrite.py
asottile
asottile reviewed Jun 2, 2019
View reviewed changes
Comment thread src/_pytest/assertion/rewrite.py Outdated
asottile
asottile approved these changes Jun 2, 2019
View reviewed changes

@asottile asottile left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@asottile

asottile commented Jun 2, 2019

Copy link
Copy Markdown
Member

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

@nicoddemus

nicoddemus commented Jun 2, 2019

Copy link
Copy Markdown
Member Author

I can backport this one

Sure, please go ahead! 👍 😁

@nicoddemus

nicoddemus commented Jun 2, 2019

Copy link
Copy Markdown
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

asottile commented Jun 2, 2019

Copy link
Copy Markdown
Member

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

@nicoddemus

nicoddemus commented Jun 2, 2019

Copy link
Copy Markdown
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 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

None yet

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