Skip to content

Commit 114b6e8

Browse files
emmanuelleemmanuelle
authored
Merge branch 'master' into horizontal-bar
2 parents 915b907 + 3ea8dc5 commit 114b6e8

File tree

191 files changed

+3117
-3927
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+3117
-3927
lines changed

‎.github/pull_request_template.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Doc upgrade checklist:
2+
3+
- [ ] old boilerplate at top and bottom of file has been removed
4+
- [ ] Every example is independently runnable and is optimized for short line count
5+
- [ ] no more `plot()` or `iplot()`
6+
- [ ] `graph_objs` has been renamed to `graph_objects`
7+
- [ ] `fig = <something>` call is high up in each example
8+
- [ ] minimal creation of intermediate `trace` objects
9+
- [ ] liberal use of `add_trace` and `update_layout`
10+
- [ ] `fig.show()` at the end of each example
11+
- [ ] `px` example at the top if appropriate
12+
- [ ] `v4upgrade: true` metadata added
13+
- [ ] minimize usage of hex codes for colors in favour of those in https://github.com/plotly/plotly.py-docs/issues/14

‎notebooks/1d-correlation.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
jupyter:
33
jupytext:
4+
notebook_metadata_filter: all
45
text_representation:
56
extension: .md
67
format_name: markdown
@@ -164,4 +165,4 @@ publisher.publish(
164165

165166
```python
166167

167-
```
168+
```

‎notebooks/2D-Histogram.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
jupyter:
33
jupytext:
4+
notebook_metadata_filter: all
45
text_representation:
56
extension: .md
67
format_name: markdown
@@ -44,10 +45,10 @@ plotly.__version__
4445
### 2D Histogram with Slider Control ###
4546

4647

47-
Add slider controls to 2d histograms with the [postMessage API](https://github.com/plotly/postMessage-API).
48-
See the [code on JSFiddle](https://jsfiddle.net/plotlygraphs/y9sdy76h/4/).
49-
Watch [the 5 second video](https://raw.githubusercontent.com/plotly/documentation/gh-pages/all_static/images
50-
/flight_conflicts.gif) of how it works.
48+
Add slider controls to 2d histograms with the [postMessage API](https://github.com/plotly/postMessage-API).
49+
See the [code on JSFiddle](https://jsfiddle.net/plotlygraphs/y9sdy76h/4/).
50+
Watch [the 5 second video](https://raw.githubusercontent.com/plotly/documentation/gh-pages/all_static/images
51+
/flight_conflicts.gif) of how it works.
5152

5253
```python
5354
from IPython.core.display import display,HTML
@@ -181,11 +182,11 @@ publisher.publish(
181182
'How to make 2D Histograms in Python with Plotly.',
182183
title = 'Python 2D Histograms | plotly',
183184
name = '2D Histograms',
184-
has_thumbnail='true', thumbnail='thumbnail/histogram2d.jpg',
185+
has_thumbnail='true', thumbnail='thumbnail/histogram2d.jpg',
185186
language='python', display_as='statistical', order=6,
186-
ipynb= '~notebook_demo/24')
187+
ipynb= '~notebook_demo/24')
187188
```
188189

189190
```python
190191

191-
```
192+
```

‎notebooks/2d-histogram-contour.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
jupyter:
33
jupytext:
4+
notebook_metadata_filter: all
45
text_representation:
56
extension: .md
67
format_name: markdown
@@ -108,7 +109,7 @@ trace = [go.Histogram2dContour(
108109
color = 'black'
109110
)
110111
)
111-
112+
112113
)]
113114

114115
py.iplot(trace, filename = "Histogram2dContour Styled")
@@ -212,15 +213,15 @@ publisher.publish(
212213
'histogram2dcontour.ipynb', 'python/2d-histogram-contour/', '2D Histogram Contour',
213214
'How to make 2D Histogram Contour plots in Python with Plotly.',
214215
title = '2D Histogram Contour | Plotly',
215-
has_thumbnail='true', thumbnail='thumbnail/hist2dcontour.png',
216-
language='python',
216+
has_thumbnail='true', thumbnail='thumbnail/hist2dcontour.png',
217+
language='python',
217218
# page_type='example_index', // note this is only if you want the tutorial to appear on the main page: plot.ly/python
218-
display_as='statistical',
219-
order=30,
219+
display_as='statistical',
220+
order=30,
220221
ipynb='~notebook_demo/199',
221222
uses_plotly_offline=False)
222223
```
223224

224225
```python
225226

226-
```
227+
```

‎notebooks/2d-projection-of-3d-surface.md

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
jupyter:
33
jupytext:
4+
notebook_metadata_filter: all
45
text_representation:
56
extension: .md
67
format_name: markdown
@@ -95,14 +96,14 @@ trace1= go.Surface(
9596

9697
```python
9798
axis = dict(
98-
showbackground=True,
99-
backgroundcolor="rgb(230, 230,230)",
100-
showgrid=False,
101-
zeroline=False,
99+
showbackground=True,
100+
backgroundcolor="rgb(230, 230,230)",
101+
showgrid=False,
102+
zeroline=False,
102103
showline=False)
103104

104105
ztickvals=list(range(-6,4))
105-
layout = go.Layout(title="Projections of a surface onto coordinate planes" ,
106+
layout = go.Layout(title="Projections of a surface onto coordinate planes" ,
106107
autosize=False,
107108
width=700,
108109
height=600,
@@ -127,8 +128,8 @@ y_offset=np.min(yy)*np.ones(z.shape)
127128
```
128129

129130
Define the color functions and the color numpy arrays, `C_z`, `C_x`, `C_y`, corresponding to each plane:<br>
130-
Define the 3-tuples of coordinates to be displayed at hovering the mouse over the projections.
131-
The first two coordinates give the position in the projection plane, whereas the third one is used
131+
Define the 3-tuples of coordinates to be displayed at hovering the mouse over the projections.
132+
The first two coordinates give the position in the projection plane, whereas the third one is used
132133
for assigning the color, just in the same way the coordinate z is used for the z-direction projection.
133134

134135
```python
@@ -142,7 +143,7 @@ colorsurfy=proj_z(x,y,z)
142143
textx=[['y: '+'{:0.5f}'.format(y[i][j])+'<br>z: '+'{:0.5f}'.format(z[i][j])+
143144
'<br>x: '+'{:0.5f}'.format(x[i][j]) for j in range(z.shape[1])] for i in range(z.shape[0])]
144145
texty=[['x: '+'{:0.5f}'.format(x[i][j])+'<br>z: '+'{:0.5f}'.format(z[i][j]) +
145-
'<br>y: '+'{:0.5f}'.format(y[i][j]) for j in range(z.shape[1])] for i in range(z.shape[0])]
146+
'<br>y: '+'{:0.5f}'.format(y[i][j]) for j in range(z.shape[1])] for i in range(z.shape[0])]
146147

147148
tracex = go.Surface(z=list(z),
148149
x=list(x_offset),
@@ -193,12 +194,12 @@ publisher.publish(
193194
'Plotly-project-3d-onto-a-plane.ipynb', 'python/2d-projection-of-3d-surface/', 'Projection of 3D Surface',
194195
'How to project 3D Surface plots in 2D with Plotly.',
195196
title = '2D Projection of 3D surface | plotly',
196-
has_thumbnail='true', thumbnail='thumbnail/projection-3d.jpg',
197+
has_thumbnail='true', thumbnail='thumbnail/projection-3d.jpg',
197198
language='python',
198199
display_as='3d_charts', order=19,
199200
ipynb= '~notebook_demo/79')
200201
```
201202

202203
```python
203204

204-
```
205+
```

0 commit comments

Comments
 (0)