Skip to content

Commit 4efdc59

Browse files
Merge pull request #2715 from plotly/master
safe merge of master to doc prod
2 parents c23266d + b78a1a8 commit 4efdc59

File tree

3 files changed

+2
-250
lines changed

3 files changed

+2
-250
lines changed

.circleci/config.yml

-1
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,5 @@ workflows:
519519
- python-3.7-optional
520520
- python-3.7-plot_ly
521521
- python-2-7-orca
522-
- python-3-5-orca
523522
- python-3-7-orca
524523
- build-doc

compatibility.md

-247
This file was deleted.

packages/python/plotly/plotly/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def hist_frame(data_frame, **kwargs):
158158
from .express import histogram
159159

160160
skip = ["column", "by", "grid", "xlabelsize", "xrot", "ylabelsize", "yrot"]
161-
skip += ["ax", "sharex", "sharey", "figsize", "layout", "bins"]
161+
skip += ["ax", "sharex", "sharey", "figsize", "layout", "bins", "legend"]
162162
new_kwargs = {k: kwargs[k] for k in kwargs if k not in skip}
163163
return histogram(data_frame, **new_kwargs)
164164

@@ -172,6 +172,6 @@ def hist_series(data_frame, **kwargs):
172172
from .express import histogram
173173

174174
skip = ["by", "grid", "xlabelsize", "xrot", "ylabelsize", "yrot", "ax"]
175-
skip += ["figsize", "bins"]
175+
skip += ["figsize", "bins", "legend"]
176176
new_kwargs = {k: kwargs[k] for k in kwargs if k not in skip}
177177
return histogram(data_frame, **new_kwargs)

0 commit comments

Comments
 (0)