Skip to content

Revert unrolling of all() #5373

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

Merged
merged 3 commits into from
Jun 3, 2019
Merged

Revert unrolling of all() #5373

merged 3 commits into from
Jun 3, 2019

Conversation

asottile
Copy link
Member

@asottile asottile commented Jun 3, 2019

Resolves #5370
Resolves #5371
Resolves #5372

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.

Thanks!

@Tadaboody feel free to pick this up again at a later time if you are interested in introducing this again. 👍

@asottile asottile added the needs backport applied to PRs, indicates that it should be ported to the current bug-fix branch label Jun 3, 2019
@asottile
Copy link
Member Author

asottile commented Jun 3, 2019

I can handle backporting of this one as well 👍 (the revert didn't apply cleanly so I imagine it'll have similar issues in 4.6-maintenance)

@codecov
Copy link

codecov bot commented Jun 3, 2019

Codecov Report

Merging #5373 into master will decrease coverage by 33.39%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5373      +/-   ##
==========================================
- Coverage   93.43%   60.04%   -33.4%     
==========================================
  Files         114       56      -58     
  Lines       25528    11072   -14456     
  Branches     2482     2048     -434     
==========================================
- Hits        23853     6648   -17205     
- Misses       1353     3775    +2422     
- Partials      322      649     +327
Impacted Files Coverage Δ
src/_pytest/assertion/rewrite.py 81.91% <ø> (-11.07%) ⬇️
src/_pytest/junitxml.py 26.17% <0%> (-69.65%) ⬇️
src/_pytest/unittest.py 25.96% <0%> (-68.95%) ⬇️
src/_pytest/debugging.py 23.58% <0%> (-66.47%) ⬇️
src/_pytest/mark/legacy.py 32% <0%> (-65.92%) ⬇️
src/_pytest/mark/evaluate.py 32.96% <0%> (-63.7%) ⬇️
src/_pytest/pastebin.py 25.8% <0%> (-61.92%) ⬇️
src/_pytest/setuponly.py 34% <0%> (-61.75%) ⬇️
src/_pytest/stepwise.py 36.66% <0%> (-60%) ⬇️
src/_pytest/skipping.py 37% <0%> (-58.84%) ⬇️
... and 105 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 5976f36...230f736. Read the comment docs.

@asottile asottile merged commit 63099bc into pytest-dev:master Jun 3, 2019
@asottile asottile deleted the revert_all_handling branch June 3, 2019 16:19
@blueyed
Copy link
Contributor

blueyed commented Jun 3, 2019

Oh... I've thought you reverted this only for 4.6.

@RonnyPfannschmidt
Copy link
Member

I propose never bringing this back at the ast level, there should be a difference approach

asottile added a commit that referenced this pull request Jun 3, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
[4.6] Merge pull request #5373 from asottile/revert_all_handling
@Tadaboody
Copy link
Contributor

So sorry about the fallout this created 🙏 I'll go back to the drawing board to see if this can be reintroduced in a better way. Reverting this was definitely the right decision, sorry I couldn't be more readily available to help with this

@RonnyPfannschmidt
Copy link
Member

@Tadaboody still thanks for trying, we now know that the approach as is isn't viable

since quite a while there si the idea of assertion helper objects around, perhpas we should elaborate on it and its rammifications

@nicoddemus
Copy link
Member

@Tadaboody not at all, as @RonnyPfannschmidt said, we appreciate you taking the time to implement this anyways! We should also have caught this earlier during review, but those things happen. 👍

@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
@Sup3rGeo
Copy link
Member

@nicoddemus @asottile It seems that the all unrolling was interfering with the feature #3479 I was working on, basically because this lines of code are still on the features branch:

if self._is_any_call_with_generator_or_list_comprehension(call):
return self._visit_all(call)

Was there any other PR merged on features with this all() unrolling or it was forgotten for removal in the features branch?

@asottile
Copy link
Member Author

ah yeah it's a little confusing, for the 5.x release we're just going to release from master since there's no reason to split up the work for now -- so for now target master 👍

@nicoddemus
Copy link
Member

Yep, sorry for the confusion!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants