Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 2e7fecb

Browse filesBrowse files
authored
Merge branch 'master' into add-hist-to-facet
2 parents c99c0e7 + 4ff7200 commit 2e7fecb
Copy full SHA for 2e7fecb

File tree

Expand file treeCollapse file tree

4 files changed

+77
-76
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+77
-76
lines changed

‎CHANGELOG.md

Copy file name to clipboardExpand all lines: CHANGELOG.md
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
44

55
## [2.0.12] - UNRELEASED
66
### Updated
7-
- Updated `plotly.min.js` to version 1.28.2 for `plotly.offline`.
8-
- See [the plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md#1282----2017-06-21) for additional information regarding the updates.
7+
- Updated `plotly.min.js` to version 1.28.3 for `plotly.offline`.
8+
- See [the plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md#1283----2017-06-26) for additional information regarding the updates.
99
### Added
1010
- `figure_factory.create_facet_grid` now supports histogram, bar, and box traces.
1111

‎plotly/figure_factory/_facet_grid.py

Copy file name to clipboardExpand all lines: plotly/figure_factory/_facet_grid.py
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ def _facet_grid_color_numerical(df, x, y, facet_row, facet_col, color_name,
446446
trace = dict(
447447
type=trace_type,
448448
showlegend=False,
449-
**kwargs
449+
**kwargs_trace
450450
)
451451

452452
if x:
@@ -883,7 +883,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
883883
)
884884
show_legend = False
885885
if color_name:
886-
if isinstance(df[color_name][0], str) or color_is_cat:
886+
if isinstance(df[color_name].iloc[0], str) or color_is_cat:
887887
show_legend = True
888888
if isinstance(colormap, dict):
889889
utils.validate_colors_dict(colormap, 'rgb')
@@ -912,7 +912,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
912912
SUBPLOT_SPACING, marker_color, kwargs_trace, kwargs_marker
913913
)
914914

915-
elif isinstance(df[color_name][0], Number):
915+
elif isinstance(df[color_name].iloc[0], Number):
916916
if isinstance(colormap, dict):
917917
show_legend = True
918918
utils.validate_colors_dict(colormap, 'rgb')

‎plotly/package_data/plotly.min.js

Copy file name to clipboardExpand all lines: plotly/package_data/plotly.min.js
+71-71Lines changed: 71 additions & 71 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎plotly/tests/test_optional/test_figure_factory.py

Copy file name to clipboardExpand all lines: plotly/tests/test_optional/test_figure_factory.py
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2009,6 +2009,7 @@ def test_valid_color_dict(self):
20092009
data, 'a', 'b', color_name='a',
20102010
colormap=color_dict)
20112011

2012+
20122013
def test_valid_colorscale_name(self):
20132014
data = pd.DataFrame([[0, 1, 2], [3, 4, 5]],
20142015
columns=['a', 'b', 'c'])

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.