Merge pull request plotly#1402 from plotly/py_v4

Py v4
gbowden39 · Jul 16, 2019 · ad2c347 · ad2c347
2 parents 033cf7f + 7f86931
commit ad2c347
Show file tree

Hide file tree

Showing 609 changed files with 4,268 additions and 4,285 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,4 @@ vendor/bundle
 .bundle
 _posts/python/fundamentals/static-image/images
 _config_personal.yml
-_posts/python-next/html
+_posts/python/html
diff --git a/Rakefile b/Rakefile
@@ -19,8 +19,8 @@ task :deploy => [:check_git] do
   puts "...git pull origin  \"#{source_branch}\""
   system "git pull origin  \"#{source_branch}\""
   puts "...getting latest python docs"
-  system "rm -rf _posts/python-next/html"
-  system "git clone -b built [email protected]:plotly/plotly.py-docs _posts/python-next/html"
+  system "rm -rf _posts/python/html"
+  system "git clone -b built [email protected]:plotly/plotly.py-docs _posts/python/html"
   puts "...update plot schema"
   system "python ./get_plotschema.py && git add _data/plotschema.json && git commit -m \"Updated plotschema at #{Time.now.utc}\" && git push origin \"#{source_branch}\""
   puts "...generate _site"

diff --git a/_config_python_search.yml b/_config_python_search.yml
@@ -42,6 +42,7 @@ algolia:
     - '_posts/nodejs'
     - '_posts/numpy'
     - '_posts/pandas'
+    - '_posts/python/v3'
     - '_posts/plotly_js'
     - '_posts/r'
     - '_posts/reference_pages'

diff --git a/_data/plotschema.json b/_data/plotschema.json
diff --git a/_includes/documentation_eg.html b/_includes/documentation_eg.html
@@ -143,6 +143,18 @@
 {% endif %}
 {% endfor %}
 
+{% if page.language == "python/v3" or page.language == "numpy" or page.language == "pandas" or page.language == "scikit-learn" or page.permalink contains 'ipython-notebooks' %}
+
+
+<div style="margin: 20px auto; width: 75%; background: #f4f4f8; padding: 20px; font-weight: 400;
+    line-height: 1.85; text-align: center; border: 5px dashed #ab63fa;">
+	<strong>Note:</strong> this page is part of the documentation for version 3 of Plotly.py, which is <em>not the most recent version</em>.<br/>
+	See our <a href="https://plot.ly/python/v4-migration/" style="color: #2391fe">Version 4 Migration Guide</a> for information about how to upgrade.
+</div>
+
+{% endif %}
+
+
 {% if file_settings %}
 <section class="--tutorial-section">
     <header class="--section-header"><a href="#fundamentals" name="fundamentals" id="fundamentals">Plotly Fundamentals</a>
@@ -707,7 +719,7 @@ <h1><a href="#dash-example">Dash Example</a></h1>
 <p>Find the dash app source code <a href="https://github.com/plotly/simple-example-chart-apps/tree/master/{{ page.simple_dash_appname}}">here</a>.</p>
 {% endif %}
 
-{% if page.language == "python" or page.language == "r" or page.language == "plotly_js" %}
+{% if page.language == "python/v3" or page.language == "r" or page.language == "plotly_js" %}
 <a href="https://plot.ly/products/dash/"><img src="https://s3-us-west-1.amazonaws.com/plotly-tutorials/plotly-documentation/images/1140px-Dash-ad.png"></a>
 {% endif %}
 

diff --git a/_includes/side-bar.html b/_includes/side-bar.html
@@ -183,7 +183,7 @@
                 {% endif %}
 
                 <!-- Cheat Sheets -->
-                {% if page.language == "plotly_js" or page.language == "r" or page.language == "python" or page.language == "matlab" %}
+                {% if page.language == "plotly_js" or page.language == "r" or page.language == "matlab" %}
                 <li class="--sidebar-item">
                     <a href="https://images.plot.ly/plotly-documentation/images/{{ page.language }}_cheat_sheet.pdf" class="js-splash--navigation-item">Cheat Sheet</a>
                 </li>
@@ -203,7 +203,7 @@
                 </li>
                 {% endif %}
 
-                {% if page.language == "python" or page.language == "matlab" or page.language == "r" %}
+                {% if page.language == "matlab" or page.language == "r" %}
                 <li class="--sidebar-item">
                     <a href="{{ BASE_URL }}/{{ page.language }}/offline/" class="js-splash--navigation-item">Use Offline</a>
                 </li>
@@ -258,18 +258,6 @@
                 <li class="--sidebar-item">
                     <a href="{{ BASE_URL }}/ipython-notebooks/" class="js-splash--navigation-item">IPython Notebooks</a>
                 </li>
-                <li class="--sidebar-item">
-                    <a href="{{ BASE_URL }}/matplotlib/" class="js-splash--navigation-item">Matplotlib</a>
-                </li>
-                <li class="--sidebar-item">
-                    <a href="{{ BASE_URL }}/numpy/" class="js-splash--navigation-item">Numpy</a>
-                </li>
-                <li class="--sidebar-item">
-                    <a href="{{ BASE_URL }}/pandas/" class="js-splash--navigation-item">Pandas</a>
-                </li>
-                <li class="--sidebar-item">
-                    <a href="{{ BASE_URL }}/scikit-learn/" class="js-splash--navigation-item">Scikit-Learn</a>
-                </li>
                 {% endif %}
 
                 <!-- Pandas Specific -->

diff --git a/_layouts/user-guide.html b/_layouts/user-guide.html
@@ -30,7 +30,7 @@
 							{% include search-suggestions.html %}
 						</li>
 					</ul>
-					{% if page.language == "python" or page.language == "numpy" or page.language == "scikit-learn"%}
+					{% if page.language == "python/v3" or page.language == "numpy" or page.language == "scikit-learn"%}
 					<button class="--btn back">
 						<div>
 							<img class="--icon-notebook" src="https://plot.ly/gh-pages/documentation/static/images/[email protected]" alt="notebook">
@@ -62,7 +62,7 @@
 							{% if page.language == "excel" %}
 							<img src="http://plot.ineffable.co/images/excel-logo.png" alt="">
 							{% endif %}
-							{% if page.language == "python" or page.language == "python/next" %}
+							{% if page.language == "python" or page.language == "python/v3" %}
 							<img src="https://images.plot.ly/language-icons/api-home/python-logo.png" alt="">
 							{% endif %}
 							{% if page.language == "pandas" %}
@@ -109,6 +109,20 @@ <h1>
 
 			<!-- Start Plotly Basics Section -->
 			<section class="tutorial-content">
+
+
+{% if page.language == "python/v3" or page.language == "numpy" or page.language == "pandas" or page.language == "scikit-learn" or page.permalink contains 'ipython-notebooks' %}
+{% if  page.permalink != 'ipython-notebooks/cufflinks/' %}
+
+<div style="margin: 20px auto; width: 75%; background: #f4f4f8; padding: 20px; font-weight: 400;
+    line-height: 1.85; text-align: center; border: 5px dashed #ab63fa;">
+	<strong>Note:</strong> this page is part of the documentation for version 3 of Plotly.py, which is <em>not the most recent version</em>.<br/>
+	See our <a href="https://plot.ly/python/v4-migration/" style="color: #2391fe">Version 4 Migration Guide</a> for information about how to upgrade.
+</div>
+
+{% endif %}
+{% endif %}
+
 				{{ content }}
 			</section>
 			<!--End Plotly Basics Section-->
@@ -117,6 +131,7 @@ <h1>
 
 </main>
 
+
 {% include helpbox.html %}
 
 {% include _new/_page-components/insertSidebarElement.html %}

diff --git a/_posts/dashboards/xlwings_assets/2015-06-30-xlwings.html b/_posts/dashboards/xlwings_assets/2015-06-30-xlwings.html
@@ -8,8 +8,8 @@
 page_type: example_index
 display_as: report_generation
 order: 4
-language: python
-redirect_from: 
+language: python/v3
+redirect_from:
     - /ipython-notebooks/xlwings/
     - /ipython-notebooks/excel-python-and-plotly/
 
@@ -2195,7 +2195,7 @@ <h3 id="Step-2:-Clean-and-prepare-your-data-for-plotting-using-Pandas">Step 2: C
 <span class="k">if</span> <span class="n">Range</span><span class="p">(</span><span class="s">&#39;Dashboard&#39;</span><span class="p">,</span><span class="s">&#39;C8&#39;</span><span class="p">)</span><span class="o">.</span><span class="n">value</span> <span class="o">==</span> <span class="s">&quot;Yes&quot;</span><span class="p">:</span>
     <span class="n">shtnm3</span> <span class="o">=</span> <span class="n">Range</span><span class="p">(</span><span class="s">&#39;Dashboard&#39;</span><span class="p">,</span><span class="s">&#39;B8&#39;</span><span class="p">)</span><span class="o">.</span><span class="n">value</span>
     <span class="n">df3</span> <span class="o">=</span> <span class="n">new_df</span><span class="p">(</span><span class="n">shtnm3</span><span class="p">)</span>
-    <span class="n">product_3</span> <span class="o">=</span> <span class="bp">True</span>  
+    <span class="n">product_3</span> <span class="o">=</span> <span class="bp">True</span>
 </pre></div>
 
 </div>
@@ -2243,7 +2243,7 @@ <h3 id="Step-2:-Clean-and-prepare-your-data-for-plotting-using-Pandas">Step 2: C
 <span class="k">if</span> <span class="n">product_2</span> <span class="o">==</span> <span class="bp">True</span><span class="p">:</span>
     <span class="n">df2</span><span class="o">.</span><span class="n">columns</span> <span class="o">=</span> <span class="n">clean_names</span><span class="p">(</span><span class="n">df2</span><span class="o">.</span><span class="n">columns</span><span class="o">.</span><span class="n">values</span><span class="p">)</span>
 <span class="k">if</span> <span class="n">product_3</span> <span class="o">==</span> <span class="bp">True</span><span class="p">:</span>
-    <span class="n">df3</span><span class="o">.</span><span class="n">columns</span> <span class="o">=</span> <span class="n">clean_names</span><span class="p">(</span><span class="n">df3</span><span class="o">.</span><span class="n">columns</span><span class="o">.</span><span class="n">values</span><span class="p">)</span>  
+    <span class="n">df3</span><span class="o">.</span><span class="n">columns</span> <span class="o">=</span> <span class="n">clean_names</span><span class="p">(</span><span class="n">df3</span><span class="o">.</span><span class="n">columns</span><span class="o">.</span><span class="n">values</span><span class="p">)</span>
 </pre></div>
 
 </div>
@@ -2295,10 +2295,10 @@ <h3 id="Step-3:-Plot-your-data-with-plotly">Step 3: Plot your data with plotly<a
 <div class=" highlight hl-ipython2"><pre><span class="c">#set a few global variables so we can use them throughout the plots</span>
 <span class="n">X</span> <span class="o">=</span> <span class="n">df</span><span class="o">.</span><span class="n">index</span>
 
-<span class="k">try</span><span class="p">:</span>  
+<span class="k">try</span><span class="p">:</span>
     <span class="n">ymin</span> <span class="o">=</span> <span class="nb">min</span><span class="p">(</span><span class="n">df</span><span class="p">[</span><span class="s">&#39;minpriceoffered&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">min</span><span class="p">(),</span><span class="n">df2</span><span class="p">[</span><span class="s">&#39;minpriceoffered&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">min</span><span class="p">(),</span><span class="n">df3</span><span class="p">[</span><span class="s">&#39;minpriceoffered&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">min</span><span class="p">())</span> <span class="o">-</span> <span class="mi">10</span>
     <span class="n">ymax</span> <span class="o">=</span> <span class="nb">max</span><span class="p">(</span><span class="n">df</span><span class="p">[</span><span class="s">&#39;walkupprice&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">max</span><span class="p">(),</span><span class="n">df2</span><span class="p">[</span><span class="s">&#39;walkupprice&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">max</span><span class="p">(),</span><span class="n">df3</span><span class="p">[</span><span class="s">&#39;walkupprice&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">max</span><span class="p">())</span> <span class="o">+</span> <span class="mi">10</span>
-    
+
 <span class="k">except</span><span class="p">:</span>
     <span class="c">#If that doesn&#39;t work, just go edit it on Plotly&#39;s web based plot editor. </span>
     <span class="n">ymin</span> <span class="o">=</span> <span class="n">df</span><span class="p">[</span><span class="s">&#39;minpriceoffered&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">min</span><span class="p">()</span> <span class="o">-</span> <span class="mi">10</span>
@@ -2329,7 +2329,7 @@ <h3 id="Step-3:-Plot-your-data-with-plotly">Step 3: Plot your data with plotly<a
 <span class="k">def</span> <span class="nf">new_trace</span><span class="p">(</span><span class="n">price_column</span><span class="p">,</span> <span class="n">color</span><span class="p">,</span> <span class="n">name</span><span class="p">,</span> <span class="n">x</span><span class="o">=</span><span class="n">X</span><span class="p">,</span> <span class="n">fill</span> <span class="o">=</span> <span class="s">&#39;none&#39;</span><span class="p">,</span> <span class="n">qty_column</span> <span class="o">=</span> <span class="p">[]):</span>
     <span class="n">trace</span> <span class="o">=</span> <span class="n">Scatter</span><span class="p">(</span>
     <span class="n">x</span><span class="o">=</span><span class="n">X</span><span class="p">,</span>
-    <span class="n">y</span><span class="o">=</span><span class="n">price_column</span><span class="p">,</span>  
+    <span class="n">y</span><span class="o">=</span><span class="n">price_column</span><span class="p">,</span>
     <span class="n">fill</span><span class="o">=</span><span class="n">fill</span><span class="p">,</span>
     <span class="n">mode</span><span class="o">=</span><span class="s">&#39;lines&#39;</span><span class="p">,</span>
     <span class="n">name</span><span class="o">=</span><span class="n">name</span><span class="p">,</span>
@@ -2344,9 +2344,9 @@ <h3 id="Step-3:-Plot-your-data-with-plotly">Step 3: Plot your data with plotly<a
     <span class="k">return</span> <span class="n">trace</span>
 
 <span class="c">#Set up the 3 core traces</span>
-<span class="n">trace1</span> <span class="o">=</span> <span class="n">new_trace</span><span class="p">(</span><span class="n">df</span><span class="p">[</span><span class="s">&#39;walkupprice&#39;</span><span class="p">],</span> <span class="s">&#39;#FF9966&#39;</span><span class="p">,</span><span class="s">&#39;Core Product Walkup Price&#39;</span><span class="p">)</span> 
-<span class="n">trace2</span> <span class="o">=</span> <span class="n">new_trace</span><span class="p">(</span><span class="n">df</span><span class="p">[</span><span class="s">&#39;maxpriceoffered&#39;</span><span class="p">],</span> <span class="s">&#39;#5EA5D1&#39;</span><span class="p">,</span><span class="n">shtnm1</span> <span class="o">+</span> <span class="s">&#39;Highest Price Offered&#39;</span><span class="p">,</span> <span class="n">qty_column</span><span class="o">=</span><span class="n">df</span><span class="p">[</span><span class="s">&#39;unitsmax&#39;</span><span class="p">])</span> 
-<span class="n">trace3</span> <span class="o">=</span> <span class="n">new_trace</span><span class="p">(</span><span class="n">df</span><span class="p">[</span><span class="s">&#39;minpriceoffered&#39;</span><span class="p">],</span> <span class="s">&#39;#5EA5D1&#39;</span><span class="p">,</span><span class="n">shtnm1</span><span class="o">+</span><span class="s">&#39; Starting Price&#39;</span><span class="p">,</span>  <span class="n">qty_column</span><span class="o">=</span> <span class="n">df</span><span class="p">[</span><span class="s">&#39;unitsmin&#39;</span><span class="p">],</span> <span class="n">fill</span><span class="o">=</span><span class="s">&#39;tonexty&#39;</span><span class="p">)</span> 
+<span class="n">trace1</span> <span class="o">=</span> <span class="n">new_trace</span><span class="p">(</span><span class="n">df</span><span class="p">[</span><span class="s">&#39;walkupprice&#39;</span><span class="p">],</span> <span class="s">&#39;#FF9966&#39;</span><span class="p">,</span><span class="s">&#39;Core Product Walkup Price&#39;</span><span class="p">)</span>
+<span class="n">trace2</span> <span class="o">=</span> <span class="n">new_trace</span><span class="p">(</span><span class="n">df</span><span class="p">[</span><span class="s">&#39;maxpriceoffered&#39;</span><span class="p">],</span> <span class="s">&#39;#5EA5D1&#39;</span><span class="p">,</span><span class="n">shtnm1</span> <span class="o">+</span> <span class="s">&#39;Highest Price Offered&#39;</span><span class="p">,</span> <span class="n">qty_column</span><span class="o">=</span><span class="n">df</span><span class="p">[</span><span class="s">&#39;unitsmax&#39;</span><span class="p">])</span>
+<span class="n">trace3</span> <span class="o">=</span> <span class="n">new_trace</span><span class="p">(</span><span class="n">df</span><span class="p">[</span><span class="s">&#39;minpriceoffered&#39;</span><span class="p">],</span> <span class="s">&#39;#5EA5D1&#39;</span><span class="p">,</span><span class="n">shtnm1</span><span class="o">+</span><span class="s">&#39; Starting Price&#39;</span><span class="p">,</span>  <span class="n">qty_column</span><span class="o">=</span> <span class="n">df</span><span class="p">[</span><span class="s">&#39;unitsmin&#39;</span><span class="p">],</span> <span class="n">fill</span><span class="o">=</span><span class="s">&#39;tonexty&#39;</span><span class="p">)</span>
 <span class="n">trace_list</span> <span class="o">=</span> <span class="p">[</span><span class="n">trace1</span><span class="p">,</span> <span class="n">trace2</span><span class="p">,</span> <span class="n">trace3</span><span class="p">]</span>
 </pre></div>
 
@@ -2363,11 +2363,11 @@ <h3 id="Step-3:-Plot-your-data-with-plotly">Step 3: Plot your data with plotly<a
 <div class=" highlight hl-ipython2"><pre><span class="c">#add additional traces if toggled on by user</span>
 <span class="k">if</span> <span class="n">product_2</span> <span class="o">==</span> <span class="bp">True</span><span class="p">:</span>   <span class="c">#Using the input from the Dashboard Sheet in Excel</span>
     <span class="n">trace4</span> <span class="o">=</span> <span class="n">new_trace</span><span class="p">(</span><span class="n">df2</span><span class="p">[</span><span class="s">&#39;minpriceoffered&#39;</span><span class="p">],</span> <span class="s">&#39;##66ff66&#39;</span><span class="p">,</span><span class="n">shtnm2</span><span class="o">+</span><span class="s">&#39; Lowest Price Offered&#39;</span><span class="p">)</span>
-    <span class="n">trace_list</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">trace4</span><span class="p">)</span>  
+    <span class="n">trace_list</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">trace4</span><span class="p">)</span>
 
 <span class="k">if</span> <span class="n">product_3</span> <span class="o">==</span> <span class="bp">True</span><span class="p">:</span>   <span class="c">#Using the input from the Dashboard Sheet in Excel</span>
-    <span class="n">trace5</span> <span class="o">=</span> <span class="n">new_trace</span><span class="p">(</span><span class="n">df3</span><span class="p">[</span><span class="s">&#39;minpriceoffered&#39;</span><span class="p">],</span> <span class="s">&#39;#e6e600&#39;</span><span class="p">,</span><span class="n">shtnm3</span><span class="o">+</span><span class="s">&#39; Lowest Price Offered&#39;</span><span class="p">)</span> 
-    <span class="n">trace_list</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">trace5</span><span class="p">)</span> 
+    <span class="n">trace5</span> <span class="o">=</span> <span class="n">new_trace</span><span class="p">(</span><span class="n">df3</span><span class="p">[</span><span class="s">&#39;minpriceoffered&#39;</span><span class="p">],</span> <span class="s">&#39;#e6e600&#39;</span><span class="p">,</span><span class="n">shtnm3</span><span class="o">+</span><span class="s">&#39; Lowest Price Offered&#39;</span><span class="p">)</span>
+    <span class="n">trace_list</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">trace5</span><span class="p">)</span>
 </pre></div>
 
 </div>