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

Upgrade hooks #3614

Merged
merged 2 commits into from
Jun 26, 2018
Merged

Upgrade hooks #3614

merged 2 commits into from
Jun 26, 2018

Conversation

asottile
Copy link
Member

@asottile asottile commented Jun 23, 2018

quite a bit of stuff here:

  • black learned about slices
  • black changed its mind on some reflows

@asottile
Copy link
Member Author

hmmmmmm! I'll have to look at this some more

@asottile asottile closed this Jun 23, 2018
@asottile asottile deleted the upgrade_hooks branch June 23, 2018 22:59
@asottile asottile restored the upgrade_hooks branch June 23, 2018 23:01
@asottile
Copy link
Member Author

there's a bit of an edge case with the % format rewriting that I hadn't noticed in my own code (as I liberally use unicode_literals):

>>> '%s' % (u'\u2603')
u'\u2603'
>>> '{}'.format(u'\u2603')
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
UnicodeEncodeError: 'ascii' codec can't encode character u'\u2603' in position 0: ordinal not in range(128)

going to save that for a separate branch since that bit is riskier and just do black and such

@asottile asottile reopened this Jun 23, 2018
@asottile
Copy link
Member Author

Hah black changed what line the code ends up on breaking the test. I'll fix this when I'm at a computer

@coveralls
Copy link

Coverage Status

Coverage increased (+0.05%) to 92.677% when pulling 1c49e52 on asottile:upgrade_hooks into 42b3125 on pytest-dev:master.

@asottile asottile requested review from RonnyPfannschmidt and nicoddemus and removed request for RonnyPfannschmidt June 25, 2018 17:12
Copy link
Member

@RonnyPfannschmidt RonnyPfannschmidt left a comment

Choose a reason for hiding this comment

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

i skimmed the changes and overall its getting much better - @ambv is doing a great job with getting blacks more awesome

@RonnyPfannschmidt
Copy link
Member

RonnyPfannschmidt commented Jun 26, 2018

should i sort out the conflict my other merge triggered or do we leave it for later

@asottile
Copy link
Member Author

I can reapply pretty easily

@RonnyPfannschmidt RonnyPfannschmidt merged commit f93995e into pytest-dev:master Jun 26, 2018
@asottile asottile deleted the upgrade_hooks branch August 24, 2018 01:48
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

4 participants