Merge branch 'doc-prod' into pandas-1.0

Author: emmanuelle

.circleci/create_conda_optional_env.sh

@@ -14,7 +14,7 @@ if [ ! -d $HOME/miniconda/envs/circle_optional ]; then
     ./miniconda.sh -b -p $HOME/miniconda
 
     # Create environment
-    # PYTHON_VERSION=3.6
+    # PYTHON_VERSION=2.7 or 3.5
     $HOME/miniconda/bin/conda create -n circle_optional --yes python=$PYTHON_VERSION \
 requests nbformat six retrying psutil pandas decorator pytest mock nose poppler xarray scikit-image ipython jupyter ipykernel ipywidgets
 

CHANGELOG.md

@@ -2,12 +2,30 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.5.2] - 2020-02-24
+
+### Fixed
+
+ - Fix build errors in JupyterLab extension by pinning version of `@types/plotly.js` (#2223)(https://github.com/plotly/plotly.py/issues/2223)
+
+## [4.5.1] - 2020-02-19
+
+### Updated
+ - Updated Plotly.js to version 1.52.2. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/releases/tag/v1.52.2) for more information on bug fixes.
+
+### Fixed
+
+ - `update_annotations`, `update_shapes` and `update_layout_images` now no longer require the `patch` argument, as per the docstring [#2167](https://github.com/plotly/plotly.py/issues/2167)
+ - `px.defaults` no longer accepts arbitrary keys [#2168](https://github.com/plotly/plotly.py/issues/2168)
+ - better error message when `pandas` is not installed [#2125](https://github.com/plotly/plotly.py/issues/2125)
+ - support columns of numerical type in `path` argument of `px.sunburst`/`px.treemap` and add values of `color` column in hoverlabel for `px.sunburst`/`px.treemap` [#2133](https://github.com/plotly/plotly.py/pull/2133)
+
+
+
 ## [4.5.0] - 2020-01-22
 
 ### Updated
- - Updated Plotly.js to version 1.52.1. See the
- [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/v1.52.0/CHANGELOG.md#1520----2020-01-08)
- for more information on numerous new attribute and bug fixes.
+ - Updated Plotly.js to version 1.52.1. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/v1.52.0/CHANGELOG.md#1520----2020-01-08) for more information on numerous new attribute and bug fixes.
  - Plotly Express uses the new `legend.title` attribute and so now has shorter trace `name`s [#2051](https://github.com/plotly/plotly.py/pull/2051)
  - The heuristic used by `px.parallel_categories` to determine which columns of the data frame to draw has been changed and made more configurable with the `dimensions_max_cardinality` argument [#2102](https://github.com/plotly/plotly.py/pull/2102)
  - The `simple_white` colorbar styling has been streamlined [#2110](https://github.com/plotly/plotly.py/pull/2110)

README.md

@@ -26,7 +26,7 @@
 
 ## Quickstart
 
-`pip install plotly==4.5.0`
+`pip install plotly==4.5.2`
 
 Inside [Jupyter notebook](https://jupyter.org/install) (installable with `pip install "notebook>=5.3" "ipywidgets>=7.2"`):
 
@@ -75,13 +75,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.0
+pip install plotly==4.5.2
 ```
 
 or conda.
 
 ```
-conda install -c plotly plotly=4.5.0
+conda install -c plotly plotly=4.5.2
 ```
 
 ### Jupyter Notebook Support
@@ -128,10 +128,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].0 --no-build
+jupyter labextension install [email protected].2 --no-build
 
 # and jupyterlab renderer support
-jupyter labextension install [email protected].0 --no-build
+jupyter labextension install [email protected].2 --no-build
 
 # Build extensions (must be done to activate extensions since --no-build is used above)
 jupyter lab build

binder/requirements.txt

@@ -1,5 +1,5 @@
 jupytext
-plotly==4.5.0
+plotly==4.5.1
 jupyter
 notebook
 pandas==0.23.0

contributing.md

@@ -16,7 +16,7 @@ Check out our Support App: https://support.plot.ly/libraries/python or Community
 
 ## Want to improve the plotly documentation?
 
-Thank you! Instructions on how to contribute to the documentation are given [here](doc/contributing.md). Please also read the next section if you need to setup a development environment. 
+Thank you! Instructions on how to contribute to the documentation are given [here](doc/contributing.md). Please also read the next section if you need to setup a development environment.
 
 ## Setup a Development Environment
 
@@ -57,7 +57,7 @@ conda activate plotly-dev
 ### ipywidgets development install
 
 Run the following commands in your virtual environment to use the
-development version of `FigureWidget`, 
+development version of `FigureWidget`,
 
     $ jupyter nbextension enable --py widgetsnbextension
     $ jupyter nbextension install --py --symlink --sys-prefix plotlywidget
@@ -66,7 +66,7 @@ development version of `FigureWidget`,
 To make plotly plots show up in JupyterLab, you also need to [install the plotly jupyterlab extensions][plotly-jl].
 
 [plotly-jl]: https://plot.ly/python/getting-started/#jupyterlab-support-python-35
-    
+
 ### Configure black code formatting
 This repo uses the [Black](https://black.readthedocs.io/en/stable/) code formatter,
 and the [pre-commit](https://pre-commit.com/) library to manage a git commit hook to
@@ -79,7 +79,7 @@ environment.
 
 ```bash
 (plotly_dev) $ pre-commit install
-``` 
+```
 
 Now, whenever you perform a commit, the Black formatter will run.  If the formatter
 makes no changes, then the commit will proceed.  But if the formatter does make changes,
@@ -110,16 +110,16 @@ Once you've made your changes (and hopefully written some tests...), make that p
 
 
 ## Update to a new version of Plotly.js
-First update the version of the `plotly.js` dependency in `js/package.json`.
+First update the version of the `plotly.js` dependency in `packages/javascript/plotlywidget/package.json`.
 
 Then run the `updateplotlyjs` command with:
 
 ```bash
 $ python setup.py updateplotlyjs
 ```
 
-This will download new versions of `plot-schema.json` and `plotly.min.js` from 
-the `plotly/plotly.js` GitHub repository (and place them in 
+This will download new versions of `plot-schema.json` and `plotly.min.js` from
+the `plotly/plotly.js` GitHub repository (and place them in
 `plotly/package_data`). It will then regenerate all of the `graph_objs`
 classes based on the new schema.
 
@@ -205,15 +205,15 @@ You're *strongly* encouraged to write tests that check your added functionality.
 
 When you write a new test anywhere under the `tests` directory, if your PR gets accepted, that test will run in a virtual machine to ensure that future changes don't break your contributions!
 
-Test accounts include: `PythonTest`, `PlotlyImageTest`, and  `PlotlyStageTest`. 
+Test accounts include: `PythonTest`, `PlotlyImageTest`, and  `PlotlyStageTest`.
 
 ## Release process - plotly package
 
 This is the release process for releasing `plotly.py` version `X.Y.Z` with
-`plotlywidget` version `A.B.C`.
+`plotlywidget`/`jupyterlab-plotly` version `A.B.C`.
 
 Note: The `plotlywidget` instructions must be followed if any change
-has been made in the `js/` directory source code, OR if the version of
+has been made in the `packages/javascript` directory source code, OR if the version of
 plotly.js has been updated.  If neither of these is the case, there's no need
 to increment the `plotlywidget` version or to publish a new version to npm.
 
@@ -235,7 +235,7 @@ noteable changes as sub-bullets (new trace types in particular), and provide
 a link to the plotly.js CHANGELOG.
 
 As the first entry in the changelog, include a `JupyterLab Versions` section.
-Here, document the versions of `plotlywidget`, 
+Here, document the versions of `plotlywidget`,
 `@jupyter-widgets/jupyterlab-manager`, `jupyterlab`, and
 `@jupyterlab/plotly-extension` that are known to be compatible with this
 version of `plotly.py`.
@@ -253,7 +253,9 @@ Note that the conda installation instructions must include
 "-c plotly/lable/test" rather than "-c plotly" in order to install the
 release candidate version.
 
-Commit Changelog and README updates.
+Update the `doc/python/getting-started.md` file with the same version numbers.
+
+Commit Changelog, README and getting-started updates.
 
 ### Bump to release candidate version
  1) Manually update the plotlywidget version to `A.B.C-rc.1` in the files
@@ -263,17 +265,21 @@ specified below.
    + Update `__frontend_version__` to `^A.B.C-rc.1` (Note the `^` prefix)
  - `packages/javascript/plotlywidget/package.json`
    + Update `"version"` to `A.B.C-rc.1`
-   
+   + Run `npm install && npm run build`
+ - `packages/javascript/jupyterlab-plotly/package.json`
+   + Update `"version"` to `A.B.C-rc.1`
+   + Run `npm install && npm run build`
+
  2) Commit the changes
- 
+
  3) Tag this commit on the release branch as `vX.Y.Zrc1` and `widget-vA.B.C-rc.1`
-   
+
 In both cases `rc` is the semantic versioning code for Release Candidate.
-   
+
 The number 1 means that this is the first release candidate, this number can
 be incremented if we need to publish multiple release candidates.
 Note that the `npm` suffix is `-rc.1` and the PyPI suffix is `rc1`.
- 
+
 Publishing `plotly.py` and `plotlywidget` as release candidates
 allows us to go through the publication process, and test that the
 installed packages work properly before general users will get them by
@@ -291,44 +297,54 @@ And, you'll need the credentials file `~/.pypirc`. Request access from
 @jonmmease and @chriddyp. Then, from inside the repository:
 
 ```bash
+(plotly_dev) $ cd packages/python/plotly
 (plotly_dev) $ git checkout release_X.Y.Z
 (plotly_dev) $ git stash
+(plotly_dev) $ rm -rf dist
 (plotly_dev) $ python setup.py sdist bdist_wheel
+(plotly_dev) $ rm dist/*dirty*
 (plotly_dev) $ twine upload dist/plotly-X.Y.Zrc1*
 ```
 
-### Publish release candidate of `plotlywidget` to NPM
+Note: this will intentionally fail if your current git tree is dirty, because we want the tag
+to reflect what is being released, and the version number comes from the tag and the dirty-state.
+
+
+### Publish release candidate of `plotlywidget` and `jupyterlab-plotly` to NPM
 Now, publish the release candidate of the `plotlywidget` NPM package.
 
 ```bash
-cd ./js
-npm publish --access public --tag next
+cd ./packages/javascript/plotlywidget
+npm run build && npm publish --access public --tag next
 ```
 
 The `--tag next` part ensures that users won't install this version unless
 they explicitly ask for the version or for the version wtih the `next` tag.
 
+Do the same in the `jupyterlab-plotly` directory.
+
 ### Publish release candidate to plotly anaconda channel
 To publish package to the plotly anaconda channel you'll need to have the
 anaconda or miniconda distribution installed, and you'll need to have the
 `anaconda-client` package installed.
 
 ```bash
+(plotly_dev) $ conda config --set anaconda_upload no
 (plotly_dev) $ conda build recipe/
 ```
 
 Next run `anaconda login` and enter the credentials for the plotly anaconda
 channel.
-          
+
 Then upload artifacts to the anaconda channel using the test label. Using the test
 label will ensure that people will only download the release candidate version
 if they explicitly request it.
 
 ```
-$ anaconda upload --label test /path/to/anaconda3/conda-bld/noarch/plotly-*.tar.bz2 
+$ anaconda upload --label test /path/to/anaconda3/conda-bld/noarch/plotly-*.tar.bz2
 ```
 
-Then logout with `anaconda logout` 
+Then logout with `anaconda logout`
 
 ### Manually test the release candidate
 Create a fresh virtual environment (or conda environment) and install
@@ -340,7 +356,7 @@ https://github.com/jonmmease/plotly_ipywidget_notebooks using the classic
 notebook and JupyterLab. Make sure `FigureWidget` objects are displayed as
 plotly figures, and make sure the in-place updates and callbacks work.
 
-If appropriate, ask users who have submitted bug reports or feature 
+If appropriate, ask users who have submitted bug reports or feature
 requests that are resolved in this version to try out the release candidate.
 
 If problems are found in the release candidate, fix them on the release
@@ -352,7 +368,7 @@ Update CHANGELOG with release date and update README with final versions.
 
 In the conda installation instructions, be sure to change the
 "-c plotly/label/test" argument to "-c plotly"
- 
+
 Commit updates.
 
 ### Finalize versions
@@ -361,17 +377,21 @@ release candidate suffix from the following version strings:
 
  - `plotly/_widget_version.py`:
    + Update `__frontend_version__` to `^A.B.C` (Note the `^` prefix)
- - `js/package.json`
+ - `packages/javascript/plotlywidget/package.json`
+   + Update `"version"` to `A.B.C`
+   + Run `npm install && npm run build`
+ - `packages/javascript/jupyterlab-plotly/package.json`
    + Update `"version"` to `A.B.C`
-   
+   + Run `npm install && npm run build`
+
 Commit and push to the release branch.
 
 ### Merge release into master
 Make sure the integration tests are passing on the release branch, then merge
 it into master on GitHub.
 
 Make sure tests also pass on master, then update your local master,
-tag this merge commit as `vX.Y.Z` (e.g. `v3.1.1`) and `widget-vA.B.C` 
+tag this merge commit as `vX.Y.Z` (e.g. `v3.1.1`) and `widget-vA.B.C`
 
 push the tag.
 
@@ -391,10 +411,15 @@ Publish the final version to PyPI
 
 ```bash
 (plotly_dev) $ cd packages/python/plotly
+(plotly_dev) $ rm -rf dist
 (plotly_dev) $ python setup.py sdist bdist_wheel
+(plotly_dev) $ rm dist/*dirty*
 (plotly_dev) $ twine upload dist/plotly-X.Y.Z*
 ```
 
+Note: this will intentionally fail if your current git tree is dirty, because we want the tag
+to reflect what is being released, and the version number comes from the tag and the dirty-state.
+
 After it has uploaded, move to another environment and double+triple check that you are able to upgrade ok:
 ```bash
 $ pip install plotly --upgrade
@@ -408,18 +433,20 @@ And ask one of your friends to do it too. Our tests should catch any issues, but
 Finally, publish the final version of the widget library to npm with:
 
 ```bash
-cd ./js
-npm publish --access public
+cd packages/javascript/jupyterlab-plotly
+npm run build && npm publish --access public
+cd packages/javascript/plotlywidget
+npm run build && npm publish --access public
 ```
 
 ### Publishing to the plotly conda channel
 Follow the anaconda upload instructions as described for the release candidate
 above, except:
 
  - Do not include the `--label test` argument when uploading
- 
+
 ```
-$ anaconda upload /path/to/anaconda3/conda-bld/noarch/plotly-*.tar.bz2 
+$ anaconda upload /path/to/anaconda3/conda-bld/noarch/plotly-*.tar.bz2
 ```
 
 ### Add GitHub Release entry
@@ -431,6 +458,19 @@ Make "Release title" the same string as the tag.
 
 Copy changelog section for this version as the "Describe this release"
 
+### Upgrade doc requirements and API doc
+
+Files to be updated:
+- `doc/apidoc/conf.py` with new version number
+- `doc/requirements.txt`
+- `binder/requirements.txt`
+
+### Synchronize master and doc-prod branches
+
+doc-prod should already have been merged on a regular basis into master, but
+start doing it first. Then merge master into doc-prod to deploy the doc related
+to features in the release.
+
 ### Post announcement
 Post a simple announcement to the Plotly Python forum, with links to the
 README installation instructions and to the CHANGELOG.
@@ -480,7 +520,7 @@ From `packages/python/plotly-geo`, build the conda packge
 Then upload to the plotly anaconda channel as described above
 
 ## Release process - chart-studio package
-The `chart-studio` package contains the utilities for interacting with 
+The `chart-studio` package contains the utilities for interacting with
 Chart Studio (both Cloud or On-Prem).
 
 ### Update version

doc/apidoc/conf.py

@@ -28,7 +28,7 @@
 # The short X.Y version
 version = ""
 # The full version, including alpha/beta/rc tags
-release = "4.2"
+release = "4.5.1"
 
 
 # -- General configuration ---------------------------------------------------