fixing merge conflicts

Author: pragyagarg642

.circleci/config.yml

@@ -409,7 +409,7 @@ jobs:
               cd ../../../doc
             fi
             echo 'export PATH="/home/circleci/project/doc/node_modules/.bin:$PATH"' >> $BASH_ENV
-            sudo apt-get install -y poppler-utils libxtst6 xvfb libgtk2.0-0 libgconf-2-4 libnss3 libasound2
+            sudo apt-get install -y poppler-utils libxtst6 xvfb libgtk2.0-0 libgconf-2-4 libnss3 libasound2 rename
             cd ..
 
       - save_cache:

.circleci/create_conda_optional_env.sh

@@ -19,5 +19,5 @@ if [ ! -d $HOME/miniconda/envs/circle_optional ]; then
 requests nbformat six retrying psutil pandas decorator pytest mock nose poppler xarray scikit-image ipython jupyter ipykernel ipywidgets
 
     # Install orca into environment
-    $HOME/miniconda/bin/conda install --yes -n circle_optional -c plotly plotly-orca
+    $HOME/miniconda/bin/conda install --yes -n circle_optional -c plotly plotly-orca==1.3.1
 fi

.github/pull_request_template.md

@@ -0,0 +1,36 @@
+<!--
+Please uncomment this block and take a look at this checklist if your PR is making substantial changes to **documentation**/impacts files in the `doc` directory. Check all that apply to your PR, and leave the rest unchecked to discuss with your reviewer! Not all boxes must be checked for every PR :)
+
+If your PR modifies code of the `plotly` package, we have a different checklist
+below :-).
+
+### Documentation PR
+
+- [ ] I've [seen the `doc/README.md` file](https://github.com/plotly/plotly.py/blob/master/doc/README.md)
+- [ ] This change runs in the current version of Plotly on PyPI and targets the `doc-prod` branch OR it targets the `master` branch
+- [ ] If this PR modifies the first example in a page or adds a new one, it is a `px` example if at all possible
+- [ ] Every new/modified example has a descriptive title and motivating sentence or paragraph
+- [ ] Every new/modified example is independently runnable
+- [ ] Every new/modified example is optimized for short line count	and focuses on the Plotly/visualization-related aspects of the example rather than the computation required to produce the data being visualized
+- [ ] Meaningful/relatable datasets are used for all new examples instead of randomly-generated data where possible
+- [ ] The random seed is set if using randomly-generated data in new/modified examples
+- [ ] New/modified remote datasets are loaded from https://plotly.github.io/datasets and added to https://github.com/plotly/datasets
+- [ ] Large computations are avoided in the new/modified examples in favour of loading remote datasets that represent the output of such computations
+- [ ] Imports are `plotly.graph_objects as go` / `plotly.express as px` / `plotly.io as pio`
+- [ ] Data frames are always called `df`
+- [ ] `fig = <something>` call is high up in each new/modified example (either `px.<something>` or `make_subplots` or `go.Figure`)
+- [ ] Liberal use is made of `fig.add_*` and `fig.update_*` rather than `go.Figure(data=..., layout=...)` in every new/modified example
+- [ ] Specific adders and updaters like `fig.add_shape` and `fig.update_xaxes` are used instead of big `fig.update_layout` calls in every new/modified example
+- [ ] `fig.show()` is at the end of each new/modified example
+- [ ] `plotly.plot()` and `plotly.iplot()` are not used in any new/modified example
+- [ ] Hex codes for colors are not used in any new/modified example in favour of [these nice ones](https://github.com/plotly/plotly.py/issues/2192)
+
+## Code PR
+
+- [ ] I have read through the [contributing notes](https://github.com/plotly/plotly.py/blob/master/contributing.md) and understand the structure of the package. In particular, if my PR modifies code of `plotly.graph_objects`, my modifications concern the `codegen` files and not generated files.
+- [ ] I have added tests (if submitting a new feature or correcting a bug) or
+  modified existing tests.
+- [ ] For a new feature, I have added documentation examples in an existing or
+  new tutorial notebook (please see the doc checklist as well).
+
+-->

CHANGELOG.md

@@ -2,6 +2,23 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.5.4] - 2020-03-11
+
+### Updated
+
+- The documentation of the API https://plot.ly/python-api-reference/ now
+  documents the full API [#2243](https://github.com/plotly/plotly.py/pull/2243)
+- New documentation examples for facets [#2235](https://github.com/plotly/plotly.py/pull/2235), legend [#2227](https://github.com/plotly/plotly.py/pull/2227), subplots [#2226](https://github.com/plotly/plotly.py/pull/2226), axes [#2234](https://github.com/plotly/plotly.py/pull/2234) and histograms [#2242](https://github.com/plotly/plotly.py/pull/2242). 
+  Thanks to [@SylwiaOliwia2](https://github.com/@SylwiaOliwia2) for all these great
+  examples!
+
+### Fixed
+
+- Jupyterlab extension now compatible with both Jupyterlab 1.2 and 2.0 [#2261](https://github.com/plotly/plotly.py/pull/2261) with thanks to [@consideRatio](https://github.com/consideRatio) for the contribution!
+- Fixed a bug when using boolean values for the color argument of px functions [#2127](https://github.com/plotly/plotly.py/pull/2127)
+- Corrected import bug which was occuring with old versions of ipywidgets [#2265](https://github.com/plotly/plotly.py/pull/2265)
+- Fixed python 3.8 syntax warning [#2262](https://github.com/plotly/plotly.py/pull/2262), with thanks to [@sgn](https://github.com/sgn) for the contribution!
+
 ## [4.5.3] - 2020-03-05
 
 ### Updated

README.md

@@ -8,6 +8,14 @@
             <img src="https://badge.fury.io/py/plotly.svg"/>
         </td>
     </tr>
+    <tr>
+        <td>User forum</td>
+        <td>
+            <a href="https://community.plot.ly"/>
+            <img src="https://img.shields.io/badge/help_forum-discourse-blue.svg"/>
+        </td>
+    </tr>
+
     <tr>
         <td>PyPI Downloads</td>
         <td>
@@ -26,7 +34,7 @@
 
 ## Quickstart
 
-`pip install plotly==4.5.3`
+`pip install plotly==4.5.4`
 
 Inside [Jupyter notebook](https://jupyter.org/install) (installable with `pip install "notebook>=5.3" "ipywidgets>=7.2"`):
 
@@ -45,7 +53,7 @@ Read about what's new in [plotly.py v4](https://medium.com/plotly/plotly-py-4-0-
 
 ## Overview
 
-[plotly.py](https://plot.ly/d3-js-for-python-and-pandas-charts/) is an interactive, open-source, and browser-based graphing library for Python :sparkles:
+[plotly.py](https://plot.ly/python) is an interactive, open-source, and browser-based graphing library for Python :sparkles:
 
 Built on top of [plotly.js](https://github.com/plotly/plotly.js), `plotly.py` is a high-level, declarative charting library. plotly.js ships with over 30 chart types, including scientific charts, 3D graphs, statistical charts, SVG maps, financial charts, and more.
 
@@ -61,12 +69,12 @@ Built on top of [plotly.js](https://github.com/plotly/plotly.js), `plotly.py` is
 ---
 
 - [Online Documentation](https://plot.ly/python)
-- [Contributing](contributing.md)
+- [Contributing to plotly](contributing.md)
 - [Changelog](CHANGELOG.md)
 - [Code of Conduct](CODE_OF_CONDUCT.md)
 - [Version 4 Migration Guide](https://plot.ly/python/next/v4-migration/)
 - [New! Announcing Dash 1.0](https://medium.com/plotly/welcoming-dash-1-0-0-f3af4b84bae)
-- [Community](https://community.plot.ly/c/api/python)
+- [Community forum](https://community.plot.ly/c/api/python)
 
 ---
 
@@ -75,13 +83,13 @@ Built on top of [plotly.js](https://github.com/plotly/plotly.js), `plotly.py` is
 plotly.py may be installed using pip...
 
 ```
-pip install plotly==4.5.3
+pip install plotly==4.5.4
 ```
 
 or conda.
 
 ```
-conda install -c plotly plotly=4.5.3
+conda install -c plotly plotly=4.5.4
 ```
 
 ### Jupyter Notebook Support
@@ -128,10 +136,10 @@ set NODE_OPTIONS=--max-old-space-size=4096
 jupyter labextension install @jupyter-widgets/[email protected] --no-build
 
 # FigureWidget support
-jupyter labextension install [email protected].3 --no-build
+jupyter labextension install [email protected].4 --no-build
 
 # and jupyterlab renderer support
-jupyter labextension install [email protected].3 --no-build
+jupyter labextension install [email protected].4 --no-build
 
 # Build extensions (must be done to activate extensions since --no-build is used above)
 jupyter lab build
@@ -153,7 +161,7 @@ installation of the plotly [orca](https://github.com/plotly/orca) command line u
 These dependencies can both be installed using conda:
 
 ```
-conda install -c plotly plotly-orca psutil
+conda install -c plotly plotly-orca==1.3.1 psutil
 ```
 
 Or, `psutil` can be installed using pip...

binder/requirements.txt

@@ -1,16 +1,17 @@
 jupytext
-plotly==4.5.1
+plotly==4.5.4
 jupyter
 notebook
-pandas==0.23.0
+pandas
 statsmodels==0.10.1
-scipy==1.3.1
+scipy
 patsy==0.5.1
-numpy==1.16.0
+numpy
 plotly-geo
 psutil
 requests
 networkx
 scikit-image
 datashader
 pyarrow
+cufflinks==0.17.3