Merge remote-tracking branch 'upstream/main' into json-fix-normalize

WillAyd · WillAyd · commit 17da75e035cb · 2022-11-27T12:45:21.000-08:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -26,6 +26,7 @@ repos:
     hooks:
     -   id: codespell
         types_or: [python, rst, markdown]
+        additional_dependencies: [tomli]
 -   repo: https://github.com/MarcoGorelli/cython-lint
     rev: v0.2.1
     hooks:
diff --git a/doc/source/user_guide/style.ipynb b/doc/source/user_guide/style.ipynb
@@ -76,7 +76,7 @@
    "source": [
     "# Hidden cell to just create the below example: code is covered throughout the guide.\n",
     "s = df.style\\\n",
-    "      .hide_columns([('Random', 'Tumour'), ('Random', 'Non-Tumour')])\\\n",
+    "      .hide([('Random', 'Tumour'), ('Random', 'Non-Tumour')], axis='columns')\\\n",
     "      .format('{:.0f}')\\\n",
     "      .set_table_styles([{\n",
     "        'selector': '',\n",
@@ -1339,7 +1339,7 @@
     "    for series in [test1,test2,test3, test4]:\n",
     "        s = series.copy()\n",
     "        s.name=''\n",
-    "        row += \"<td>{}</td>\".format(s.to_frame().style.hide_index().bar(align=align, \n",
+    "        row += \"<td>{}</td>\".format(s.to_frame().style.hide(axis='index').bar(align=align, \n",
     "                                                           color=['#d65f5f', '#5fba7d'], \n",
     "                                                           width=100).to_html()) #testn['width']\n",
     "    row += '</tr>'\n",
diff --git a/doc/source/whatsnew/v1.5.3.rst b/doc/source/whatsnew/v1.5.3.rst
@@ -16,6 +16,7 @@ Fixed regressions
 - Fixed performance regression in :meth:`Series.isin` when ``values`` is empty (:issue:`49839`)
 - Fixed regression in :meth:`DataFrameGroupBy.transform` when used with ``as_index=False`` (:issue:`49834`)
 - Enforced reversion of ``color`` as an alias for ``c`` and ``size`` as an alias for ``s`` in function :meth:`DataFrame.plot.scatter` (:issue:`49732`)
+- Fixed regression in :meth:`SeriesGroupBy.apply` setting a ``name`` attribute on the result if the result was a :class:`DataFrame` (:issue:`49907`)
 -
 
 .. ---------------------------------------------------------------------------
diff --git a/pandas/_testing/asserters.py b/pandas/_testing/asserters.py
@@ -877,7 +877,7 @@ def assert_series_equal(
         )
 
     if check_like:
-        left, right = left.reindex_like(right), right
+        left = left.reindex_like(right)
 
     if check_freq and isinstance(left.index, (DatetimeIndex, TimedeltaIndex)):
         lidx = left.index
@@ -1159,7 +1159,7 @@ def assert_frame_equal(
     )
 
     if check_like:
-        left, right = left.reindex_like(right), right
+        left = left.reindex_like(right)
 
     # compare by blocks
     if by_blocks:
diff --git a/pandas/core/groupby/generic.py b/pandas/core/groupby/generic.py
@@ -401,7 +401,8 @@ def _wrap_applied_output(
                 not_indexed_same=not_indexed_same,
                 is_transform=is_transform,
             )
-            result.name = self.obj.name
+            if isinstance(result, Series):
+                result.name = self.obj.name
             return result
         else:
             # GH #6265 #24880
diff --git a/pandas/core/indexes/datetimelike.py b/pandas/core/indexes/datetimelike.py
@@ -446,7 +446,6 @@ def _wrap_range_setop(self, other, res_i8):
             new_freq = self.freq
         elif isinstance(res_i8, RangeIndex):
             new_freq = to_offset(Timedelta(res_i8.step))
-            res_i8 = res_i8
 
         # TODO(GH#41493): we cannot just do
         #  type(self._data)(res_i8.values, dtype=self.dtype, freq=new_freq)
diff --git a/pandas/tests/groupby/test_apply.py b/pandas/tests/groupby/test_apply.py
@@ -334,6 +334,7 @@ def f(piece):
     result = grouped.apply(f)
 
     assert isinstance(result, DataFrame)
+    assert not hasattr(result, "name")  # GH49907
     tm.assert_index_equal(result.index, ts.index)
 
 
diff --git a/pandas/tests/indexes/multi/test_reindex.py b/pandas/tests/indexes/multi/test_reindex.py
@@ -90,7 +90,6 @@ def test_reindex_lvl_preserves_type_if_target_is_empty_list_or_array():
 
 
 def test_reindex_base(idx):
-    idx = idx
     expected = np.arange(idx.size, dtype=np.intp)
 
     actual = idx.get_indexer(idx)
diff --git a/pandas/tests/indexes/multi/test_take.py b/pandas/tests/indexes/multi/test_take.py
@@ -18,7 +18,6 @@ def test_take(idx):
 
 
 def test_take_invalid_kwargs(idx):
-    idx = idx
     indices = [1, 2]
 
     msg = r"take\(\) got an unexpected keyword argument 'foo'"
diff --git a/pandas/tests/reshape/merge/test_merge_asof.py b/pandas/tests/reshape/merge/test_merge_asof.py
@@ -210,7 +210,6 @@ def test_basic_left_index(self, trades, asof, quotes):
     def test_basic_right_index(self, trades, asof, quotes):
 
         expected = asof
-        trades = trades
         quotes = quotes.set_index("time")
 
         result = merge_asof(
diff --git a/pyproject.toml b/pyproject.toml
@@ -147,7 +147,6 @@ disable = [
   "raise-missing-from",
   "redefined-builtin",
   "redefined-outer-name",
-  "self-assigning-variable",
   "self-cls-assignment",
   "signature-differs",
   "super-init-not-called",
@@ -335,3 +334,7 @@ exclude_lines = [
 
 [tool.coverage.html]
 directory = "coverage_html_report"
+
+[tool.codespell]
+ignore-words-list = "blocs, coo, hist, nd, sav, ser, recuse"
+ignore-regex = 'https://([\w/\.])+'
diff --git a/setup.cfg b/setup.cfg
@@ -283,7 +283,3 @@ exclude =
     # work around issue of undefined variable warnings
     # https://github.com/pandas-dev/pandas/pull/38837#issuecomment-752884156
     doc/source/getting_started/comparison/includes/*.rst
-
-[codespell]
-ignore-words-list = blocs,coo,hist,nd,sav,ser,recuse
-ignore-regex = https://([\w/\.])+

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ Fixed regressions`
`16`	`16`	- Fixed performance regression in :meth:`Series.isin` when ``values`` is empty (:issue:`49839`)
`17`	`17`	- Fixed regression in :meth:`DataFrameGroupBy.transform` when used with ``as_index=False`` (:issue:`49834`)
`18`	`18`	- Enforced reversion of ``color`` as an alias for ``c`` and ``size`` as an alias for ``s`` in function :meth:`DataFrame.plot.scatter` (:issue:`49732`)
	`19`	+- Fixed regression in :meth:`SeriesGroupBy.apply` setting a ``name`` attribute on the result if the result was a :class:`DataFrame` (:issue:`49907`)
`19`	`20`	`-`
`20`	`21`
`21`	`22`	`.. ---------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -877,7 +877,7 @@ def assert_series_equal(`
`877`	`877`	`)`
`878`	`878`
`879`	`879`	`if check_like:`
`880`		`- left, right = left.reindex_like(right), right`
	`880`	`+ left = left.reindex_like(right)`
`881`	`881`
`882`	`882`	`if check_freq and isinstance(left.index, (DatetimeIndex, TimedeltaIndex)):`
`883`	`883`	`lidx = left.index`
`@@ -1159,7 +1159,7 @@ def assert_frame_equal(`
`1159`	`1159`	`)`
`1160`	`1160`
`1161`	`1161`	`if check_like:`
`1162`		`- left, right = left.reindex_like(right), right`
	`1162`	`+ left = left.reindex_like(right)`
`1163`	`1163`
`1164`	`1164`	`# compare by blocks`
`1165`	`1165`	`if by_blocks:`