Use black 19.10b0 #29508

alimcmaster1 · 2019-11-09T12:31:33Z

closes black==19.10b0 breaks CI #29341
passes black pandas
passes git diff upstream/master -u -- "*.py" | flake8 --diff

Main differences can be found on the 19.10 changelog:

https://black.readthedocs.io/en/stable/change_log.html

pandas/core/groupby/grouper.py

pandas/io/parsers.py

jbrockmendel · 2019-11-09T15:29:42Z

pandas/tests/arrays/sparse/test_array.py

-        res = sparse[4:,]  # noqa: E231
+        res = sparse[
+            4:,
+        ]  # noqa: E231


this is pretty gnarly. is there an alternative?

Seems related to: psf/black#1139

Is there a way to turn off formatting for a single line? (something like res = sparse[4:, ] # fmt: off, but from their README it seems this only works for blocks)

I was surprised that black doesn't support this - I upvoted -> psf/black#790

I suspect they will revert this in psf/black#1139

alimcmaster1 · 2019-11-09T16:26:15Z

pandas/tests/indexing/test_callable.py

        tm.assert_frame_equal(res, df.loc[df.A > 2,])  # noqa: E231

-        res = df.loc[lambda x: x.A > 2,]  # noqa: E231


This doesn't read any better either

jschendel

Might be nice explicitly specify the version of black in the .pre-commit-config.yaml:

pandas/.pre-commit-config.yaml

Lines 2 to 6 in 9bbb5f0

    
           -   repo: https://github.com/python/black 
        
               rev: stable 
        
               hooks: 
        
               -   id: black 
        
                   language_version: python3.7

Just a matter of modifying stable --> 19.10b0

alimcmaster1 · 2019-11-09T17:04:08Z

Might be nice explicitly specify the version of black in the .pre-commit-config.yaml:

pandas/.pre-commit-config.yaml

Lines 2 to 6 in 9bbb5f0

- repo: https://github.com/python/black

rev: stable

hooks:

- id: black

language_version: python3.7

Just a matter of modifying stable --> 19.10b0

Good point - done!

jreback

this is backward incompatible? pls update the contributing guide as well

alimcmaster1 · 2019-11-09T17:57:52Z

this is backward incompatible? pls update the contributing guide as well

Added a note in contributing guide.

Correct - backwards incompatible. i.e Running an older version will undo some of the changes here.

Examples of the backwards incompatible issues can be found here:
psf/black#1139

WillAyd

lgtm

jreback · 2019-11-11T14:35:53Z

can you merge master.

@TomAugspurger @jorisvandenbossche

so this will force the new black in development. I think we are ok with this as its a dev dep.

TomAugspurger · 2019-11-11T14:58:07Z

SGTM

…

On Mon, Nov 11, 2019 at 8:36 AM Jeff Reback ***@***.***> wrote: can you merge master. @TomAugspurger <https://github.com/TomAugspurger> @jorisvandenbossche <https://github.com/jorisvandenbossche> so this will force the new black in development. I *think* we are ok with this as its a dev dep. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#29508?email_source=notifications&email_token=AAKAOITKW2TM4PMTCMVJG3LQTFUVDA5CNFSM4JLGLBI2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEDXAMLY#issuecomment-552470063>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAKAOISTA7SJDP7MJOIIIU3QTFUVDANCNFSM4JLGLBIQ> .

jorisvandenbossche

Looks good to me as well (if black changes output, there is no way around fixing this / pinning black versions more strictly)

I am only wondering if we should wait a bit longer with adopting black 19.10. It seems there are several open issues of regressions related to the "trailing comma in tuple" formatting (which gave some ugly / confusing reformatting in this PR). Given that feedback, they might further tweak that output (on the other hand, it's only a few occurrences in the pandas codebase, so can always easily change again later)

jorisvandenbossche · 2019-11-11T14:59:04Z

pandas/tests/io/parser/test_index_col.py

@@ -22,8 +22,8 @@ def test_index_col_named(all_parsers, with_header):
 KORD5,19990127, 22:00:00, 21:56:00, -0.5900, 1.7100, 5.1000, 0.0000, 290.0000
 KORD6,19990127, 23:00:00, 22:56:00, -0.5900, 1.7100, 4.6000, 0.0000, 280.0000"""  # noqa
    header = (
-        "ID,date,NominalTime,ActualTime,TDew,TAir,Windspeed,Precip,WindDir\n"
-    )  # noqa
+        "ID,date,NominalTime,ActualTime,TDew,TAir,Windspeed,Precip,WindDir\n"  # noqa


I suppose this noqa is also not needed? (was needed before for too long line length, but that is no longer the case)

Ahh I missed this - done

jorisvandenbossche · 2019-11-11T15:06:54Z

pandas/tests/arrays/sparse/test_array.py

-        res = sparse[4:,]  # noqa: E231
+        res = sparse[
+            4:,
+        ]  # noqa: E231


Is there a way to turn off formatting for a single line? (something like res = sparse[4:, ] # fmt: off, but from their README it seems this only works for blocks)

…mali-black

alimcmaster1 · 2019-11-11T22:46:39Z

Merged master and addressed final comments.

alimcmaster1 · 2019-11-11T22:47:28Z

@jorisvandenbossche in reply to your comment:

I was surprised that black doesn't support this - I upvoted -> psf/black#790

I hope they will address this soon psf/black#1139

alimcmaster1 · 2019-11-14T12:46:42Z

Anything else needed here @jreback @jorisvandenbossche ?

jreback · 2019-11-14T13:45:38Z

can you see if there is going to be a forthcoming releases in black. some of these changes might be reverted. I don't have a problem with fixing the version of black that we are using. but we shouldn't churn unecessarily.

alimcmaster1 · 2019-11-14T16:38:23Z

can you see if there is going to be a forthcoming releases in black. some of these changes might be reverted. I don't have a problem with fixing the version of black that we are using. but we shouldn't churn unecessarily.

Sure it seems there will be a stable black release in 2019 (no more betas) - according to @ambv - here.

psf/black#1139 isn't fixed on black master yet though - I imagine the only the changes made here that may be revert are to test_callable.py and test_array.py

jorisvandenbossche · 2019-11-14T20:52:11Z

I am fine with merging this now, it's only a small change that we might need to revert again

pep8speaks · 2019-11-15T19:55:22Z

Hello @alimcmaster1! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2019-11-17 14:43:16 UTC

pandas/core/indexes/base.py

alimcmaster1 · 2019-11-17T15:34:35Z

Merged master and green. cc @jreback

jreback · 2019-11-14T13:43:08Z

environment.yml

@@ -15,7 +15,7 @@ dependencies:
  - cython>=0.29.13

  # code checks
-  - black<=19.3b0
+  - black>=19.10b0


let's make this ==

Sure done here - #29673

jreback · 2019-11-17T15:42:20Z

thanks @alimcmaster1

alimcmaster1 added 2 commits November 9, 2019 12:30

Use black 19.10b0

5362f81

Use black 19.10b0

7689986

alimcmaster1 mentioned this pull request Nov 9, 2019

black==19.10b0 breaks CI #29341

Closed

jbrockmendel reviewed Nov 9, 2019

View reviewed changes

pandas/core/groupby/grouper.py Outdated Show resolved Hide resolved

jbrockmendel reviewed Nov 9, 2019

View reviewed changes

pandas/io/parsers.py Outdated Show resolved Hide resolved

jbrockmendel reviewed Nov 9, 2019

View reviewed changes

alimcmaster1 commented Nov 9, 2019

View reviewed changes

Remove noqa

6970c0f

jschendel reviewed Nov 9, 2019

View reviewed changes

pre commit config

e6eac60

jreback requested changes Nov 9, 2019

View reviewed changes

Contributing note

a17f582

WillAyd approved these changes Nov 9, 2019

View reviewed changes

WillAyd added the Code Style Code style, linting, code_checks label Nov 9, 2019

WillAyd added this to the 1.0 milestone Nov 9, 2019

jorisvandenbossche approved these changes Nov 11, 2019

View reviewed changes

alimcmaster1 added 2 commits November 11, 2019 21:54

Merge branch 'master' of https://github.com/pandas-dev/pandas into mc…

292bca8

…mali-black

Updates as per comments

3017af6

alimcmaster1 closed this Nov 13, 2019

alimcmaster1 reopened this Nov 13, 2019

Merge branch 'master' into mcmali-black

13b359f

Update grouper.py

9efb63d

jbrockmendel reviewed Nov 15, 2019

View reviewed changes

pandas/core/indexes/base.py Outdated Show resolved Hide resolved

alimcmaster1 added 4 commits November 16, 2019 00:12

Update as per comments

cb33cab

Update as per comments

2e3bff4

Merge remote-tracking branch 'remotes/upstream/master' into mcmali-black

c33d574

Merge master

df35964

jreback approved these changes Nov 17, 2019

View reviewed changes

jreback merged commit c79fc04 into pandas-dev:master Nov 17, 2019

alimcmaster1 mentioned this pull request Nov 17, 2019

CI: Pin black to version 19.10b0 #29673

Merged

Reksbril pushed a commit to Reksbril/pandas that referenced this pull request Nov 18, 2019

Use black 19.10b0 (pandas-dev#29508)

bd1190e

proost pushed a commit to proost/pandas that referenced this pull request Dec 19, 2019

Use black 19.10b0 (pandas-dev#29508)

09edbeb

proost pushed a commit to proost/pandas that referenced this pull request Dec 19, 2019

Use black 19.10b0 (pandas-dev#29508)

0e03175

alimcmaster1 deleted the mcmali-black branch December 25, 2019 20:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use black 19.10b0 #29508

Use black 19.10b0 #29508

alimcmaster1 commented Nov 9, 2019 •

edited

Loading

jbrockmendel Nov 9, 2019

alimcmaster1 Nov 9, 2019

jorisvandenbossche Nov 11, 2019

alimcmaster1 Nov 11, 2019

alimcmaster1 Nov 9, 2019

jschendel left a comment

alimcmaster1 commented Nov 9, 2019

jreback left a comment

alimcmaster1 commented Nov 9, 2019

WillAyd left a comment

jreback commented Nov 11, 2019

TomAugspurger commented Nov 11, 2019 via email

jorisvandenbossche left a comment

jorisvandenbossche Nov 11, 2019

alimcmaster1 Nov 11, 2019

jorisvandenbossche Nov 11, 2019

alimcmaster1 commented Nov 11, 2019

alimcmaster1 commented Nov 11, 2019 •

edited

Loading

alimcmaster1 commented Nov 14, 2019

jreback commented Nov 14, 2019

alimcmaster1 commented Nov 14, 2019

jorisvandenbossche commented Nov 14, 2019

pep8speaks commented Nov 15, 2019 •

edited

Loading

alimcmaster1 commented Nov 17, 2019

jreback Nov 14, 2019

alimcmaster1 Nov 17, 2019

jreback commented Nov 17, 2019

		tm.assert_frame_equal(res, df.loc[df.A > 2,]) # noqa: E231

		res = df.loc[lambda x: x.A > 2,] # noqa: E231

	- repo: https://github.com/python/black
	rev: stable
	hooks:
	- id: black
	language_version: python3.7

Use black 19.10b0 #29508

Use black 19.10b0 #29508

Conversation

alimcmaster1 commented Nov 9, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jschendel left a comment

Choose a reason for hiding this comment

alimcmaster1 commented Nov 9, 2019

jreback left a comment

Choose a reason for hiding this comment

alimcmaster1 commented Nov 9, 2019

WillAyd left a comment

Choose a reason for hiding this comment

jreback commented Nov 11, 2019

TomAugspurger commented Nov 11, 2019 via email

jorisvandenbossche left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alimcmaster1 commented Nov 11, 2019

alimcmaster1 commented Nov 11, 2019 • edited Loading

alimcmaster1 commented Nov 14, 2019

jreback commented Nov 14, 2019

alimcmaster1 commented Nov 14, 2019

jorisvandenbossche commented Nov 14, 2019

pep8speaks commented Nov 15, 2019 • edited Loading

Comment last updated at 2019-11-17 14:43:16 UTC

alimcmaster1 commented Nov 17, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jreback commented Nov 17, 2019

alimcmaster1 commented Nov 9, 2019 •

edited

Loading

alimcmaster1 commented Nov 11, 2019 •

edited

Loading

pep8speaks commented Nov 15, 2019 •

edited

Loading