Skip to content

Backport PR #22141 on branch v3.5.x (Fix check 1d) #22592

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.

Sign up for GitHub

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 1 commit into from
Mar 3, 2022
Merged

Backport PR #22141 on branch v3.5.x (Fix check 1d) #22592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 5 additions & 39 deletions lib/matplotlib/cbook/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1300,47 +1300,13 @@ def _to_unmasked_float_array(x):

def _check_1d(x):
"""Convert scalars to 1D arrays; pass-through arrays as is."""
if hasattr(x, 'to_numpy'):
# if we are given an object that creates a numpy, we should use it...
x = x.to_numpy()
if not hasattr(x, 'shape') or len(x.shape) < 1:
return np.atleast_1d(x)
else:
try:
# work around
# https://github.com/pandas-dev/pandas/issues/27775 which
# means the shape of multi-dimensional slicing is not as
# expected. That this ever worked was an unintentional
# quirk of pandas and will raise an exception in the
# future. This slicing warns in pandas >= 1.0rc0 via
# https://github.com/pandas-dev/pandas/pull/30588
#
# < 1.0rc0 : x[:, None].ndim == 1, no warning, custom type
# >= 1.0rc1 : x[:, None].ndim == 2, warns, numpy array
# future : x[:, None] -> raises
#
# This code should correctly identify and coerce to a
# numpy array all pandas versions.
with warnings.catch_warnings(record=True) as w:
warnings.filterwarnings(
"always",
category=Warning,
message='Support for multi-dimensional indexing')

ndim = x[:, None].ndim
# we have definitely hit a pandas index or series object
# cast to a numpy array.
if len(w) > 0:
return np.asanyarray(x)
# We have likely hit a pandas object, or at least
# something where 2D slicing does not result in a 2D
# object.
if ndim < 2:
return np.atleast_1d(x)
return x
# In pandas 1.1.0, multidimensional indexing leads to an
# AssertionError for some Series objects, but should be
# IndexError as described in
# https://github.com/pandas-dev/pandas/issues/35527
except (AssertionError, IndexError, TypeError):
return np.atleast_1d(x)
return x


def _reshape_2D(X, name):
Expand Down Expand Up @@ -1649,7 +1615,7 @@ def index_of(y):
The x and y values to plot.
"""
try:
return y.index.values, y.values
return y.index.to_numpy(), y.to_numpy()
except AttributeError:
pass
try:
Expand Down
14 changes: 9 additions & 5 deletions lib/matplotlib/tests/test_axes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1762,11 +1762,15 @@ def test_bar_hatches(fig_test, fig_ref):

def test_pandas_minimal_plot(pd):
# smoke test that series and index objcets do not warn
x = pd.Series([1, 2], dtype="float64")
plt.plot(x, x)
plt.plot(x.index, x)
plt.plot(x)
plt.plot(x.index)
for x in [pd.Series([1, 2], dtype="float64"),
pd.Series([1, 2], dtype="Float64")]:
plt.plot(x, x)
plt.plot(x.index, x)
plt.plot(x)
plt.plot(x.index)
df = pd.DataFrame({'col': [1, 2, 3]})
plt.plot(df)
plt.plot(df, df)


@image_comparison(['hist_log'], remove_text=True)
Expand Down