Skip to content

TYP: annotate plotting._matplotlib.misc #36017

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
4c5eddd
REF: remove unnecesary try/except
jbrockmendel Aug 21, 2020
c632c9f
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Aug 21, 2020
9e64be3
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Aug 21, 2020
42649fb
TST: add test for agg on ordered categorical cols (#35630)
mathurk1 Aug 21, 2020
47121dd
TST: resample does not yield empty groups (#10603) (#35799)
tkmz-n Aug 21, 2020
1decb3e
revert accidental rebase
jbrockmendel Aug 22, 2020
57c5dd3
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 22, 2020
a358463
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 23, 2020
ffa7ad7
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 23, 2020
e5e98d4
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 24, 2020
408db5a
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 24, 2020
d3493cf
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 25, 2020
75a805a
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 25, 2020
9f61070
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 25, 2020
2d10f6e
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 26, 2020
3e20187
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 26, 2020
e27d07f
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 27, 2020
c52bed4
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 27, 2020
b69d4d7
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 28, 2020
1c5f8fd
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 28, 2020
061c9e2
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 28, 2020
0129a83
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 30, 2020
4d0d8e8
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 30, 2020
715848f
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 30, 2020
01f9c50
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 31, 2020
5f4f7dc
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 31, 2020
4f1f4e1
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 31, 2020
aa7d119
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 31, 2020
1f783d1
Merge branch 'master' of https://github.com/pandas-dev/pandas into ma…
jbrockmendel Aug 31, 2020
15c0f12
TYP: annotate plotting._matplotlib.misc
jbrockmendel Aug 31, 2020
820e485
Merge branch 'master' of https://github.com/pandas-dev/pandas into an…
jbrockmendel Sep 1, 2020
662e220
remove Any
jbrockmendel Sep 1, 2020
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
62 changes: 47 additions & 15 deletions pandas/plotting/_matplotlib/misc.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
import random
from typing import TYPE_CHECKING, Dict, List, Optional, Set

import matplotlib.lines as mlines
import matplotlib.patches as patches
import numpy as np

from pandas._typing import Label

from pandas.core.dtypes.missing import notna

from pandas.io.formats.printing import pprint_thing
from pandas.plotting._matplotlib.style import _get_standard_colors
from pandas.plotting._matplotlib.tools import _set_ticks_props, _subplots

if TYPE_CHECKING:
from matplotlib.axes import Axes
from matplotlib.figure import Figure

from pandas import DataFrame, Series


def scatter_matrix(
frame,
frame: "DataFrame",
alpha=0.5,
figsize=None,
ax=None,
Expand Down Expand Up @@ -114,7 +123,14 @@ def _get_marker_compat(marker):
return marker


def radviz(frame, class_column, ax=None, color=None, colormap=None, **kwds):
def radviz(
frame: "DataFrame",
class_column,
ax: Optional["Axes"] = None,
color=None,
colormap=None,
**kwds,
) -> "Axes":
import matplotlib.pyplot as plt

def normalize(series):
Expand All @@ -130,7 +146,7 @@ def normalize(series):
if ax is None:
ax = plt.gca(xlim=[-1, 1], ylim=[-1, 1])

to_plot = {}
to_plot: Dict[Label, List[List]] = {}
colors = _get_standard_colors(
num_colors=len(classes), colormap=colormap, color_type="random", color=color
)
Expand Down Expand Up @@ -197,8 +213,14 @@ def normalize(series):


def andrews_curves(
frame, class_column, ax=None, samples=200, color=None, colormap=None, **kwds
):
frame: "DataFrame",
class_column,
ax: Optional["Axes"] = None,
samples: int = 200,
color=None,
colormap=None,
**kwds,
) -> "Axes":
import matplotlib.pyplot as plt

def function(amplitudes):
Expand Down Expand Up @@ -231,7 +253,7 @@ def f(t):
classes = frame[class_column].drop_duplicates()
df = frame.drop(class_column, axis=1)
t = np.linspace(-np.pi, np.pi, samples)
used_legends = set()
used_legends: Set[str] = set()

color_values = _get_standard_colors(
num_colors=len(classes), colormap=colormap, color_type="random", color=color
Expand All @@ -256,7 +278,13 @@ def f(t):
return ax


def bootstrap_plot(series, fig=None, size=50, samples=500, **kwds):
def bootstrap_plot(
series: "Series",
fig: Optional["Figure"] = None,
size: int = 50,
samples: int = 500,
**kwds,
) -> "Figure":

import matplotlib.pyplot as plt

Expand Down Expand Up @@ -306,19 +334,19 @@ def bootstrap_plot(series, fig=None, size=50, samples=500, **kwds):


def parallel_coordinates(
frame,
frame: "DataFrame",
class_column,
cols=None,
ax=None,
ax: Optional["Axes"] = None,
color=None,
use_columns=False,
xticks=None,
colormap=None,
axvlines=True,
axvlines: bool = True,
axvlines_kwds=None,
sort_labels=False,
sort_labels: bool = False,
**kwds,
):
) -> "Axes":
import matplotlib.pyplot as plt

if axvlines_kwds is None:
Expand All @@ -333,7 +361,7 @@ def parallel_coordinates(
else:
df = frame[cols]

used_legends = set()
used_legends: Set[str] = set()

ncols = len(df.columns)

Expand Down Expand Up @@ -385,7 +413,9 @@ def parallel_coordinates(
return ax


def lag_plot(series, lag=1, ax=None, **kwds):
def lag_plot(
series: "Series", lag: int = 1, ax: Optional["Axes"] = None, **kwds
) -> "Axes":
# workaround because `c='b'` is hardcoded in matplotlib's scatter method
import matplotlib.pyplot as plt

Expand All @@ -402,7 +432,9 @@ def lag_plot(series, lag=1, ax=None, **kwds):
return ax


def autocorrelation_plot(series, ax=None, **kwds):
def autocorrelation_plot(
series: "Series", ax: Optional["Axes"] = None, **kwds
) -> "Axes":
import matplotlib.pyplot as plt

n = len(series)
Expand Down
2 changes: 1 addition & 1 deletion pandas/plotting/_matplotlib/style.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@


def _get_standard_colors(
num_colors=None, colormap=None, color_type="default", color=None
num_colors=None, colormap=None, color_type: str = "default", color=None
Copy link
Member

Choose a reason for hiding this comment

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

another potential use of Literal

):
import matplotlib.pyplot as plt

Expand Down