STYLE upgrade black formatter #51348

MarcoGorelli · 2023-02-12T19:19:19Z

gonna have to do this eventually...

I'm trying to tell if it changed anything other than just deleting newlines, any git masters know how to do that?

rhshadrach

Highlighting changes other than removed new lines and the change to black versions

The added newlines are interesting; not sure why it's doing that.

rhshadrach · 2023-02-12T19:30:36Z

pandas/_libs/hashtable.pyi

-    ) -> tuple[
-        np.ndarray,  # np.ndarray[subclass-specific]
-        npt.NDArray[np.intp],
-    ] | np.ndarray: ...  # np.ndarray[subclass-specific]
+    ) -> (
+        tuple[
+            np.ndarray,  # np.ndarray[subclass-specific]
+            npt.NDArray[np.intp],
+        ]
+        | np.ndarray
+    ): ...  # np.ndarray[subclass-specific]


rhshadrach · 2023-02-12T19:30:45Z

pandas/conftest.py

@@ -168,7 +168,7 @@ def pytest_collection_modifyitems(items, config) -> None:
        if "/frame/" in item.nodeid:
            item.add_marker(pytest.mark.arraymanager)

-        for (mark, kwd, skip_if_found, arg_name) in marks:
+        for mark, kwd, skip_if_found, arg_name in marks:


rhshadrach · 2023-02-12T19:30:58Z

pandas/core/algorithms.py

@@ -1700,6 +1695,7 @@ def diff(arr, n: int, axis: AxisInt = 0):
 # --------------------------------------------------------------------
 # Helper functions

+


rhshadrach · 2023-02-12T19:31:05Z

pandas/core/apply.py

@@ -939,7 +937,7 @@ def series_generator(self):
                yield obj._ixs(i, axis=0)

        else:
-            for (arr, name) in zip(values, self.index):
+            for arr, name in zip(values, self.index):


rhshadrach · 2023-02-12T19:31:25Z

pandas/core/dtypes/concat.py

@@ -48,6 +48,7 @@ def concat_compat(to_concat, axis: AxisInt = 0, ea_compat_axis: bool = False):
    -------
    a single array, preserving the combined dtypes
    """
+


rhshadrach · 2023-02-12T19:37:05Z

pandas/tests/window/test_expanding.py

@@ -205,7 +204,7 @@ def test_iter_expanding_series(ser, expected, min_periods):
    # GH 11704
    expected = [Series(values, index=index) for (values, index) in expected]

-    for (expected, actual) in zip(expected, ser.expanding(min_periods)):
+    for expected, actual in zip(expected, ser.expanding(min_periods)):


rhshadrach · 2023-02-12T19:37:15Z

pandas/tests/window/test_rolling.py

-    for (expected, actual) in zip(
-        expected, df.rolling(window, min_periods=min_periods)
-    ):
+    for expected, actual in zip(expected, df.rolling(window, min_periods=min_periods)):


rhshadrach · 2023-02-12T19:37:22Z

pandas/tests/window/test_rolling.py

-    for (expected, actual) in zip(
-        expected, ser.rolling(window, min_periods=min_periods)
-    ):
+    for expected, actual in zip(expected, ser.rolling(window, min_periods=min_periods)):


rhshadrach · 2023-02-12T19:37:29Z

pandas/tests/window/test_rolling.py

@@ -948,7 +942,7 @@ def test_iter_rolling_datetime(expected, expected_index, window):
        Series(values, index=idx) for (values, idx) in zip(expected, expected_index)
    ]

-    for (expected, actual) in zip(expected, ser.rolling(window)):
+    for expected, actual in zip(expected, ser.rolling(window)):


rhshadrach · 2023-02-12T19:37:54Z

setup.py

@@ -393,6 +393,7 @@ def run(self):
 # ----------------------------------------------------------------------
 # Specification of Dependencies

+


thanks! did you do this manually or do you have some magical git diff option? 🧙

Ah, just manual.

MarcoGorelli · 2023-02-14T11:18:28Z

thanks @rhshadrach for going through the changes - I think they look fine

@lithomas1 is it OK to go ahead with this, or does it need to wait til after the release?

…tter

lithomas1 · 2023-02-14T18:12:25Z

+1 on landing, let's do this before the branch cut.

MarcoGorelli · 2023-02-14T18:42:47Z

cool, I've updated - let's merge on green-ish then?

mroeschke · 2023-02-14T21:02:02Z

Sorry I just merged a few PRs since this got updated.

Since it's a style change that could impact all PRs, lets rebase once more (I won't merge any other PRs) and get this in

MarcoGorelli · 2023-02-14T21:04:52Z

I just tried fetching and merging upstream/main locally, and then did pre-commit run --all-files, and everything passed

So I think we should be safe to just merge directly

mroeschke · 2023-02-14T21:06:04Z

Ah nice thanks for checking.

mroeschke · 2023-02-14T21:07:32Z

Thanks @MarcoGorelli

MarcoGorelli · 2023-02-14T21:08:04Z

thank you

So I think we should be safe to just merge directly

If this doesn't work I accept full blame

upgrade black formatter

2da264e

rhshadrach reviewed Feb 12, 2023

View reviewed changes

mroeschke added the Code Style Code style, linting, code_checks label Feb 13, 2023

Merge remote-tracking branch 'upstream/main' into upgrade-black-forma…

3e17016

…tter

MarcoGorelli requested a review from lithomas1 February 14, 2023 19:25

lithomas1 approved these changes Feb 14, 2023

View reviewed changes

lithomas1 added this to the 2.0 milestone Feb 14, 2023

mroeschke approved these changes Feb 14, 2023

View reviewed changes

mroeschke merged commit fe85cbf into pandas-dev:main Feb 14, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

STYLE upgrade black formatter #51348

STYLE upgrade black formatter #51348

MarcoGorelli commented Feb 12, 2023

rhshadrach left a comment •

edited

Loading

rhshadrach Feb 12, 2023

rhshadrach Feb 12, 2023

rhshadrach Feb 12, 2023

rhshadrach Feb 12, 2023

rhshadrach Feb 12, 2023

rhshadrach Feb 12, 2023

rhshadrach Feb 12, 2023

rhshadrach Feb 12, 2023

rhshadrach Feb 12, 2023

rhshadrach Feb 12, 2023

MarcoGorelli Feb 12, 2023

rhshadrach Feb 14, 2023

MarcoGorelli commented Feb 14, 2023

lithomas1 commented Feb 14, 2023

MarcoGorelli commented Feb 14, 2023

mroeschke commented Feb 14, 2023

MarcoGorelli commented Feb 14, 2023

mroeschke commented Feb 14, 2023

mroeschke commented Feb 14, 2023

MarcoGorelli commented Feb 14, 2023

		@@ -1700,6 +1695,7 @@ def diff(arr, n: int, axis: AxisInt = 0):
		# --------------------------------------------------------------------
		# Helper functions

		@@ -393,6 +393,7 @@ def run(self):
		# ----------------------------------------------------------------------
		# Specification of Dependencies

STYLE upgrade black formatter #51348

STYLE upgrade black formatter #51348

Conversation

MarcoGorelli commented Feb 12, 2023

rhshadrach left a comment • 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

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MarcoGorelli commented Feb 14, 2023

lithomas1 commented Feb 14, 2023

MarcoGorelli commented Feb 14, 2023

mroeschke commented Feb 14, 2023

MarcoGorelli commented Feb 14, 2023

mroeschke commented Feb 14, 2023

mroeschke commented Feb 14, 2023

MarcoGorelli commented Feb 14, 2023

rhshadrach left a comment •

edited

Loading