Skip to content

Commit ce1232d

Browse files
chriddypchriddyp
committed
Merge branch '1.0' of https://github.com/plotly/python-api into 1.0
2 parents 6c42d61 + f5109bc commit ce1232d

15 files changed

Lines changed: 7788 additions & 474 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Plotly's Python-API
88

99
* [In-Depth Guide](http://htmlpreview.github.com/?https://github.com/plotly/python-api/blob/1.0/notebooks/Plotly%20and%20Python.html)
1010

11-
* [Plotly and matplotlib](http://htmlpreview.github.com/?https://github.com/plotly/python-api/blob/1.0/notebooks/Plotly%20and%20mpld3.html)
11+
* [Plotly and matplotlib](http://htmlpreview.github.com/?https://github.com/plotly/python-api/blob/1.0/notebooks/Plotly%20and%20matplotlib%20and%20mpld3.html)
1212

1313
* Official docs: [https://plot.ly/python](https://plot.ly/python)
1414

‎makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ html_nbs : notebooks
1717
ipython nbconvert 'Plotly and Python.ipynb'; \
1818
python add_some_css.py 'Plotly and Python.html'
1919
cd notebooks; \
20-
ipython nbconvert 'Plotly and mpld3.ipynb'; \
21-
python add_some_css.py 'Plotly and mpld3.html'
20+
ipython nbconvert 'Plotly and matplotlib and mpld3.ipynb'; \
21+
python add_some_css.py 'Plotly and matplotlib and mpld3.html'
2222
cd notebooks; \
2323
ipython nbconvert Quickstart.ipynb; \
2424
python add_some_css.py Quickstart.html

‎notebooks/Plotly and matplotlib and mpld3.html‎

Lines changed: 6305 additions & 0 deletions
Large diffs are not rendered by default.

notebooks/Plotly and mpld3.ipynb renamed to notebooks/Plotly and matplotlib and mpld3.ipynb

Lines changed: 179 additions & 417 deletions
Large diffs are not rendered by default.

‎notebooks/Quickstart.html‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1698,7 +1698,7 @@ <h1 id="quickstart-with-plotly">Quickstart with Plotly</h1>
16981698
<div class="cell border-box-sizing code_cell rendered">
16991699
<div class="input">
17001700
<div class="prompt input_prompt">
1701-
In&nbsp;[15]:
1701+
In&nbsp;[1]:
17021702
</div>
17031703
<div class="inner_cell">
17041704
<div class="input_area">
@@ -1729,7 +1729,7 @@ <h1 id="quickstart-with-plotly">Quickstart with Plotly</h1>
17291729
<div class="cell border-box-sizing code_cell rendered">
17301730
<div class="input">
17311731
<div class="prompt input_prompt">
1732-
In&nbsp;[16]:
1732+
In&nbsp;[2]:
17331733
</div>
17341734
<div class="inner_cell">
17351735
<div class="input_area">
@@ -1748,14 +1748,14 @@ <h1 id="quickstart-with-plotly">Quickstart with Plotly</h1>
17481748
</div>
17491749
<div class="inner_cell">
17501750
<div class="text_cell_render border-box-sizing rendered_html">
1751-
<p>Make sure that you have the latest version:</p>
1751+
<p>Check that you have the latest version:</p>
17521752
</div>
17531753
</div>
17541754
</div>
17551755
<div class="cell border-box-sizing code_cell rendered">
17561756
<div class="input">
17571757
<div class="prompt input_prompt">
1758-
In&nbsp;[17]:
1758+
In&nbsp;[3]:
17591759
</div>
17601760
<div class="inner_cell">
17611761
<div class="input_area">
@@ -1773,8 +1773,8 @@ <h1 id="quickstart-with-plotly">Quickstart with Plotly</h1>
17731773
<div class="output_area"><div class="prompt"></div>
17741774
<div class="output_subarea output_stream output_stdout output_text">
17751775
<pre>
1776-
newest release: 1.0.0
1777-
your release: 1.0.0
1776+
Newest version: 1.0.0
1777+
Your version: 1.0.0
17781778

17791779

17801780
</pre>
@@ -1797,7 +1797,7 @@ <h1 id="quickstart-with-plotly">Quickstart with Plotly</h1>
17971797
<div class="cell border-box-sizing code_cell rendered">
17981798
<div class="input">
17991799
<div class="prompt input_prompt">
1800-
In&nbsp;[18]:
1800+
In&nbsp;[4]:
18011801
</div>
18021802
<div class="inner_cell">
18031803
<div class="input_area">
@@ -1821,7 +1821,7 @@ <h1 id="quickstart-with-plotly">Quickstart with Plotly</h1>
18211821
<div class="cell border-box-sizing code_cell rendered">
18221822
<div class="input">
18231823
<div class="prompt input_prompt">
1824-
In&nbsp;[19]:
1824+
In&nbsp;[5]:
18251825
</div>
18261826
<div class="inner_cell">
18271827
<div class="input_area">
@@ -1857,7 +1857,7 @@ <h3 id="load-up-the-data-you-can-just-copy-n-paste-this-block-all-we-re-doing-is
18571857
<div class="cell border-box-sizing code_cell rendered">
18581858
<div class="input">
18591859
<div class="prompt input_prompt">
1860-
In&nbsp;[20]:
1860+
In&nbsp;[6]:
18611861
</div>
18621862
<div class="inner_cell">
18631863
<div class="input_area">
@@ -2876,19 +2876,25 @@ <h2 id="flexible-axes-and-subplots">Flexible Axes and Subplots</h2>
28762876
</div>
28772877
<div class="inner_cell">
28782878
<div class="text_cell_render border-box-sizing rendered_html">
2879-
<h3 id="check-out-more-plotly-ipython-notebooks">Check out more Plotly-IPython Notebooks</h3>
2879+
<h3 id="check-out-more-short-plotly-ipython-notebooks">Check out more short Plotly-IPython Notebooks</h3>
28802880
<ul>
2881+
<li><a href="http://htmlpreview.github.com/?https://github.com/plotly/python-api/blob/1.0/notebooks/Plotly%20and%20Python.html">Plotly and Python</a></li>
2882+
<li><a href="http://htmlpreview.github.com/?https://github.com/plotly/python-api/blob/1.0/notebooks/Plotly%20and%20mpld3.html">Plotly and matplotlib</a></li>
28812883
<li><a href="http://nbviewer.ipython.org/github/plotly/IPython-plotly/blob/master/Bubble%20Chart%20Explorer.ipynb">Bubble Chart Explorer</a></li>
28822884
<li><a href="http://nbviewer.ipython.org/gist/anonymous/8868059">Running MATLAB in IPython with Plotly Graphs</a></li>
28832885
</ul>
2886+
<h3 id="see-our-full-guidebook-">See our full guidebook:</h3>
2887+
<ul>
2888+
<li><a href="http://nbviewer.ipython.org/github/etpinard/plotly-python-doc/tree/1.0/">Your Guide to Plotly</a></li>
2889+
</ul>
28842890
<h3 id="more-resources">More resources</h3>
28852891
<ul>
28862892
<li><a href="https://plot.ly/API">Plotly Documentation</a></li>
28872893
<li><a href="https://github.com/plotly">Plotly GitHub</a></li>
28882894
<li><a href="http://twitter.com/plotlygraphs">@plotlygraphs</a></li>
28892895
<li><a href="https://facebook.com/plotly">Plotly Facebook</a></li>
28902896
<li><a href="https://plot.ly/team">The Plotly Team</a></li>
2891-
<li><a href="&#x6d;&#97;&#105;&#x6c;&#x74;&#111;&#58;&#99;&#x68;&#114;&#x69;&#x73;&#64;&#112;&#108;&#x6f;&#116;&#46;&#x6c;&#121;">&#99;&#x68;&#114;&#x69;&#x73;&#64;&#112;&#108;&#x6f;&#116;&#46;&#x6c;&#121;</a></li>
2897+
<li><a href="&#x6d;&#x61;&#x69;&#x6c;&#x74;&#111;&#x3a;&#x63;&#104;&#114;&#105;&#x73;&#x40;&#x70;&#108;&#111;&#x74;&#x2e;&#x6c;&#121;">&#x63;&#104;&#114;&#105;&#x73;&#x40;&#x70;&#108;&#111;&#x74;&#x2e;&#x6c;&#121;</a></li>
28922898
</ul>
28932899
</div>
28942900
</div>

0 commit comments

Comments
 (0)