From 91f5b13310fd48cf92e9073d12e51e8f05efd294 Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Fri, 22 May 2020 15:24:17 +0200 Subject: [PATCH 01/13] added links to px.data and px.colors in API doc --- doc/apidoc/plotly.express.rst | 11 ++++++++++- .../plotly/plotly/express/colors/__init__.py | 14 ++++++++++++++ packages/python/plotly/plotly/express/data.py | 10 ++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 packages/python/plotly/plotly/express/colors/__init__.py diff --git a/doc/apidoc/plotly.express.rst b/doc/apidoc/plotly.express.rst index 191ca9f4a70..4656e873c5b 100644 --- a/doc/apidoc/plotly.express.rst +++ b/doc/apidoc/plotly.express.rst @@ -1,7 +1,7 @@ .. _px: `plotly.express`: high-level interface for data visualization -================================ +============================================================= The `plotly.express `_ module is plotly's high-level API for rapid figure generation. :: @@ -49,4 +49,13 @@ plotly's high-level API for rapid figure generation. :: imshow +`plotly.express` submodules +--------------------------- + + +.. toctree:: + :maxdepth: 1 + + generated/plotly.data.rst + generated/plotly.express.colors.rst diff --git a/packages/python/plotly/plotly/express/colors/__init__.py b/packages/python/plotly/plotly/express/colors/__init__.py new file mode 100644 index 00000000000..5591a634fe5 --- /dev/null +++ b/packages/python/plotly/plotly/express/colors/__init__.py @@ -0,0 +1,14 @@ +"""For a list of colors available in `plotly.express.colors`, please see + +* the `tutorial on discrete color sequences `_ +* the `list of built-in continuous color scales `_ +""" + +from __future__ import absolute_import +from plotly.colors import * + +__all__ = ['cyclical', + 'diverging', + 'sequential', + 'qualitative', + ] diff --git a/packages/python/plotly/plotly/express/data.py b/packages/python/plotly/plotly/express/data.py index 375de95c4fd..b80f066685e 100644 --- a/packages/python/plotly/plotly/express/data.py +++ b/packages/python/plotly/plotly/express/data.py @@ -1,2 +1,12 @@ from __future__ import absolute_import from plotly.data import * + +__all__ = [ + 'carshare', + 'election', + 'election_geojson', + 'gapminder', + 'iris', + 'tips', + 'wind' + ] From c684a069355fcfc3734b790c2699cd91e8581a9f Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Fri, 22 May 2020 15:44:04 +0200 Subject: [PATCH 02/13] black --- .../plotly/plotly/express/colors/__init__.py | 11 ++++++----- packages/python/plotly/plotly/express/data.py | 16 ++++++++-------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/packages/python/plotly/plotly/express/colors/__init__.py b/packages/python/plotly/plotly/express/colors/__init__.py index 5591a634fe5..44f9cef2508 100644 --- a/packages/python/plotly/plotly/express/colors/__init__.py +++ b/packages/python/plotly/plotly/express/colors/__init__.py @@ -7,8 +7,9 @@ from __future__ import absolute_import from plotly.colors import * -__all__ = ['cyclical', - 'diverging', - 'sequential', - 'qualitative', - ] +__all__ = [ + "cyclical", + "diverging", + "sequential", + "qualitative", +] diff --git a/packages/python/plotly/plotly/express/data.py b/packages/python/plotly/plotly/express/data.py index b80f066685e..ae3ec606262 100644 --- a/packages/python/plotly/plotly/express/data.py +++ b/packages/python/plotly/plotly/express/data.py @@ -2,11 +2,11 @@ from plotly.data import * __all__ = [ - 'carshare', - 'election', - 'election_geojson', - 'gapminder', - 'iris', - 'tips', - 'wind' - ] + "carshare", + "election", + "election_geojson", + "gapminder", + "iris", + "tips", + "wind", +] From f074ea3133802872f8bfff166ad9807cdd462dcb Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Fri, 22 May 2020 15:49:42 +0200 Subject: [PATCH 03/13] removed colors.py as colors has been moved from module to package --- packages/python/plotly/plotly/express/colors.py | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 packages/python/plotly/plotly/express/colors.py diff --git a/packages/python/plotly/plotly/express/colors.py b/packages/python/plotly/plotly/express/colors.py deleted file mode 100644 index 134f1707e9a..00000000000 --- a/packages/python/plotly/plotly/express/colors.py +++ /dev/null @@ -1,2 +0,0 @@ -from __future__ import absolute_import -from plotly.colors import * From e94ae0a605fef039003e29ea8b9a8e0c51d3b446 Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Fri, 22 May 2020 16:32:59 +0200 Subject: [PATCH 04/13] try to solve import problem --- packages/python/plotly/plotly/express/_core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python/plotly/plotly/express/_core.py b/packages/python/plotly/plotly/express/_core.py index ae11d40f2b1..03de22833ba 100644 --- a/packages/python/plotly/plotly/express/_core.py +++ b/packages/python/plotly/plotly/express/_core.py @@ -3,7 +3,7 @@ from collections import namedtuple, OrderedDict from _plotly_utils.basevalidators import ColorscaleValidator -from .colors import qualitative, sequential +from plotly.colors import qualitative, sequential import math import pandas as pd import numpy as np From 12bb1f1e34ccc2336c706025c6422ea4ef70a8e9 Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Sat, 23 May 2020 15:28:33 +0200 Subject: [PATCH 05/13] data subpackage in plotly express --- doc/apidoc/Makefile | 4 ++-- doc/apidoc/plotly.express.rst | 2 +- packages/python/plotly/plotly/colors.py | 9 +++++++++ packages/python/plotly/plotly/express/colors/__init__.py | 3 +++ .../plotly/plotly/express/{data.py => data/__init__.py} | 0 5 files changed, 15 insertions(+), 3 deletions(-) rename packages/python/plotly/plotly/express/{data.py => data/__init__.py} (100%) diff --git a/doc/apidoc/Makefile b/doc/apidoc/Makefile index c2220effc2f..99a151e088e 100644 --- a/doc/apidoc/Makefile +++ b/doc/apidoc/Makefile @@ -3,7 +3,7 @@ # You can set these variables from the command line. SPHINXOPTS = -SPHINXBUILD = python3 -m sphinx +SPHINXBUILD = python -m sphinx SOURCEDIR = . BUILDDIR = _build @@ -22,7 +22,7 @@ help: sed -i 's/:class:`plotly.graph_objects/:class:`plotly.graph_objs/g' ../../packages/python/plotly/plotly/graph_objs/*/*.py sed -i 's/:class:`plotly.graph_objects/:class:`plotly.graph_objs/g' ../../packages/python/plotly/plotly/graph_objs/*/*/*.py sed -i 's/:class:`plotly.graph_objects/:class:`plotly.graph_objs/g' ../../packages/python/plotly/plotly/graph_objs/*/*/*/*.py - sphinx-apidoc -o generated ../../packages/python/plotly/plotly ../../packages/python/plotly/plotly/validators ../../packages/python/plotly/plotly/tests ../../packages/python/plotly/plotly/matplotlylib/ ../../packages/python/plotly/plotly/offline ../../packages/python/plotly/plotly/api + sphinx-apidoc -E -M -o generated ../../packages/python/plotly/plotly ../../packages/python/plotly/plotly/validators ../../packages/python/plotly/plotly/tests ../../packages/python/plotly/plotly/matplotlylib/ ../../packages/python/plotly/plotly/offline ../../packages/python/plotly/plotly/api @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) git checkout -- ../../packages/python/plotly/plotly/graph_objs rename 's/graph_objs/graph_objects/' _build/html/*.html _build/html/generated/*.html diff --git a/doc/apidoc/plotly.express.rst b/doc/apidoc/plotly.express.rst index 4656e873c5b..4d69f1e4c19 100644 --- a/doc/apidoc/plotly.express.rst +++ b/doc/apidoc/plotly.express.rst @@ -56,6 +56,6 @@ plotly's high-level API for rapid figure generation. :: .. toctree:: :maxdepth: 1 - generated/plotly.data.rst + generated/plotly.express.data.rst generated/plotly.express.colors.rst diff --git a/packages/python/plotly/plotly/colors.py b/packages/python/plotly/plotly/colors.py index 1cd57ec88b1..3f60ffd83ad 100644 --- a/packages/python/plotly/plotly/colors.py +++ b/packages/python/plotly/plotly/colors.py @@ -1,2 +1,11 @@ from __future__ import absolute_import from _plotly_utils.colors import * # noqa: F401 + +__all__ = [ + "named_colorscales", + "cyclical", + "diverging", + "sequential", + "qualitative", +] + diff --git a/packages/python/plotly/plotly/express/colors/__init__.py b/packages/python/plotly/plotly/express/colors/__init__.py index 44f9cef2508..f3f3059a055 100644 --- a/packages/python/plotly/plotly/express/colors/__init__.py +++ b/packages/python/plotly/plotly/express/colors/__init__.py @@ -7,7 +7,10 @@ from __future__ import absolute_import from plotly.colors import * + + __all__ = [ + "named_colorscales", "cyclical", "diverging", "sequential", diff --git a/packages/python/plotly/plotly/express/data.py b/packages/python/plotly/plotly/express/data/__init__.py similarity index 100% rename from packages/python/plotly/plotly/express/data.py rename to packages/python/plotly/plotly/express/data/__init__.py From 7abcbea38661a271dd19b1889dfbac0fe2b88b6b Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Sat, 23 May 2020 16:13:50 +0200 Subject: [PATCH 06/13] black --- packages/python/plotly/plotly/colors.py | 1 - packages/python/plotly/plotly/express/colors/__init__.py | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/python/plotly/plotly/colors.py b/packages/python/plotly/plotly/colors.py index 3f60ffd83ad..76605dfa5e8 100644 --- a/packages/python/plotly/plotly/colors.py +++ b/packages/python/plotly/plotly/colors.py @@ -8,4 +8,3 @@ "sequential", "qualitative", ] - diff --git a/packages/python/plotly/plotly/express/colors/__init__.py b/packages/python/plotly/plotly/express/colors/__init__.py index f3f3059a055..92b3afc776c 100644 --- a/packages/python/plotly/plotly/express/colors/__init__.py +++ b/packages/python/plotly/plotly/express/colors/__init__.py @@ -8,7 +8,6 @@ from plotly.colors import * - __all__ = [ "named_colorscales", "cyclical", From 9aa0af073697ee869d07e73ea48b123305619244 Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Sat, 23 May 2020 18:12:49 +0200 Subject: [PATCH 07/13] requirements: incompatible versions of xarray and pandas --- doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index 233506781ee..edf21dacabb 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -2,7 +2,7 @@ plotly==4.7.0 jupytext==1.1.1 jupyter notebook -pandas==0.23.0 +pandas statsmodels==0.10.1 scipy==1.3.1 patsy==0.5.1 From 5776a1f80a4d051c1b8859b17624dae97be1de7e Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Sat, 23 May 2020 19:07:59 +0200 Subject: [PATCH 08/13] fix import problem --- packages/python/plotly/setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/python/plotly/setup.py b/packages/python/plotly/setup.py index ec74283d2d6..bc91e1c2197 100644 --- a/packages/python/plotly/setup.py +++ b/packages/python/plotly/setup.py @@ -480,6 +480,8 @@ def run(self): "plotly.figure_factory", "plotly.data", "plotly.express", + "plotly.express.data", + "plotly.express.colors", "plotly.graph_objects", "_plotly_utils", "_plotly_utils.colors", From 755ef06749265059476508ea9846a45ab51328d0 Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Sat, 23 May 2020 19:26:02 +0200 Subject: [PATCH 09/13] Update doc/apidoc/plotly.express.rst --- doc/apidoc/plotly.express.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/apidoc/plotly.express.rst b/doc/apidoc/plotly.express.rst index 4d69f1e4c19..c1c56c3c51b 100644 --- a/doc/apidoc/plotly.express.rst +++ b/doc/apidoc/plotly.express.rst @@ -49,7 +49,7 @@ plotly's high-level API for rapid figure generation. :: imshow -`plotly.express` submodules +`plotly.express` subpackages --------------------------- @@ -58,4 +58,3 @@ plotly's high-level API for rapid figure generation. :: generated/plotly.express.data.rst generated/plotly.express.colors.rst - From 891a2bc2976bca15e45b162db5f2c0fec062bf43 Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Mon, 25 May 2020 15:56:40 +0200 Subject: [PATCH 10/13] color namespaces --- .../python/plotly/plotly/express/colors/__init__.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/packages/python/plotly/plotly/express/colors/__init__.py b/packages/python/plotly/plotly/express/colors/__init__.py index 92b3afc776c..993de8ecfbe 100644 --- a/packages/python/plotly/plotly/express/colors/__init__.py +++ b/packages/python/plotly/plotly/express/colors/__init__.py @@ -2,6 +2,16 @@ * the `tutorial on discrete color sequences `_ * the `list of built-in continuous color scales `_ + +Color scales are available within the following namespaces + +* carto (``px.colors.carto``) +* cmocean +* colorbrewer +* cyclical +* diverging +* qualitative +* sequential """ from __future__ import absolute_import From d440d82197ebb4800baa8327725baa995d524e28 Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Tue, 26 May 2020 00:13:09 +0200 Subject: [PATCH 11/13] more doc on colors --- doc/apidoc/Makefile | 6 ++++- doc/apidoc/index.rst | 1 + .../plotly/_plotly_utils/colors/cyclical.py | 6 +++++ .../plotly/_plotly_utils/colors/diverging.py | 3 +++ .../_plotly_utils/colors/qualitative.py | 3 +++ .../plotly/_plotly_utils/colors/sequential.py | 3 +++ packages/python/plotly/plotly/colors.py | 10 -------- .../python/plotly/plotly/colors/__init__.py | 23 +++++++++++++++++++ .../plotly/plotly/express/colors/__init__.py | 3 --- packages/python/plotly/setup.py | 1 + 10 files changed, 45 insertions(+), 14 deletions(-) delete mode 100644 packages/python/plotly/plotly/colors.py create mode 100644 packages/python/plotly/plotly/colors/__init__.py diff --git a/doc/apidoc/Makefile b/doc/apidoc/Makefile index 99a151e088e..cf5cb7ebdc9 100644 --- a/doc/apidoc/Makefile +++ b/doc/apidoc/Makefile @@ -22,9 +22,13 @@ help: sed -i 's/:class:`plotly.graph_objects/:class:`plotly.graph_objs/g' ../../packages/python/plotly/plotly/graph_objs/*/*.py sed -i 's/:class:`plotly.graph_objects/:class:`plotly.graph_objs/g' ../../packages/python/plotly/plotly/graph_objs/*/*/*.py sed -i 's/:class:`plotly.graph_objects/:class:`plotly.graph_objs/g' ../../packages/python/plotly/plotly/graph_objs/*/*/*/*.py - sphinx-apidoc -E -M -o generated ../../packages/python/plotly/plotly ../../packages/python/plotly/plotly/validators ../../packages/python/plotly/plotly/tests ../../packages/python/plotly/plotly/matplotlylib/ ../../packages/python/plotly/plotly/offline ../../packages/python/plotly/plotly/api + cp ../../packages/python/plotly/_plotly_utils/colors/sequential.py ../../packages/python/plotly/_plotly_utils/colors/diverging.py ../../packages/python/plotly/_plotly_utils/colors/qualitative.py ../../packages/python/plotly/_plotly_utils/colors/cyclical.py ../../packages/python/plotly/plotly/colors + cp ../../packages/python/plotly/_plotly_utils/colors/sequential.py ../../packages/python/plotly/_plotly_utils/colors/diverging.py ../../packages/python/plotly/_plotly_utils/colors/qualitative.py ../../packages/python/plotly/_plotly_utils/colors/cyclical.py ../../packages/python/plotly/plotly/express/colors + sphinx-apidoc -M -o generated ../../packages/python/plotly/plotly ../../packages/python/plotly/plotly/validators ../../packages/python/plotly/plotly/tests ../../packages/python/plotly/plotly/matplotlylib/ ../../packages/python/plotly/plotly/offline ../../packages/python/plotly/plotly/api @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) git checkout -- ../../packages/python/plotly/plotly/graph_objs + rm ../../packages/python/plotly/plotly/colors/diverging.py ../../packages/python/plotly/plotly/colors/sequential.py ../../packages/python/plotly/plotly/colors/qualitative.py ../../packages/python/plotly/plotly/colors/cyclical.py + rm ../../packages/python/plotly/plotly/express/colors/diverging.py ../../packages/python/plotly/plotly/express/colors/sequential.py ../../packages/python/plotly/plotly/express/colors/qualitative.py ../../packages/python/plotly/plotly/express/colors/cyclical.py rename 's/graph_objs/graph_objects/' _build/html/*.html _build/html/generated/*.html mv _build/html/generated/plotly.graph_objs.html _build/html/generated/plotly.graph_objects.html sed -i 's/graph_objs/graph_objects/g' _build/html/*.html diff --git a/doc/apidoc/index.rst b/doc/apidoc/index.rst index 5776cc94621..87ad77a3fd9 100644 --- a/doc/apidoc/index.rst +++ b/doc/apidoc/index.rst @@ -17,6 +17,7 @@ Submodules * :ref:`Subplots: helper function for layout out multi-plot figures ` * :ref:`Figure Factories: helper methods for building specific complex charts ` * :ref:`I/O: low-level interface for displaying, reading and writing figures ` +* :mod:`plotly.colors`: colorscales and utility functions Full reference list ------------------- diff --git a/packages/python/plotly/_plotly_utils/colors/cyclical.py b/packages/python/plotly/_plotly_utils/colors/cyclical.py index 1c7315268fa..bab6fdfc4ff 100644 --- a/packages/python/plotly/_plotly_utils/colors/cyclical.py +++ b/packages/python/plotly/_plotly_utils/colors/cyclical.py @@ -185,3 +185,9 @@ def swatches_cyclical(template=None): if _k.startswith("_") or _k.startswith("swatches") or _k.endswith("_r"): continue globals()[_k + "_r"] = _cols[::-1] + + +__all__ = [ + "swatches", + "swatches_cyclical", +] diff --git a/packages/python/plotly/_plotly_utils/colors/diverging.py b/packages/python/plotly/_plotly_utils/colors/diverging.py index 3b4304e74df..2e20a4fd8b5 100644 --- a/packages/python/plotly/_plotly_utils/colors/diverging.py +++ b/packages/python/plotly/_plotly_utils/colors/diverging.py @@ -37,3 +37,6 @@ def swatches(template=None): if _k.startswith("_") or _k == "swatches" or _k.endswith("_r"): continue globals()[_k + "_r"] = _cols[::-1] + + +__all__ = ["swatches"] diff --git a/packages/python/plotly/_plotly_utils/colors/qualitative.py b/packages/python/plotly/_plotly_utils/colors/qualitative.py index fbc4aa6f034..41fe43fc3d6 100644 --- a/packages/python/plotly/_plotly_utils/colors/qualitative.py +++ b/packages/python/plotly/_plotly_utils/colors/qualitative.py @@ -152,3 +152,6 @@ def swatches(template=None): if _k.startswith("_") or _k == "swatches" or _k.endswith("_r"): continue globals()[_k + "_r"] = _cols[::-1] + + +__all__ = ["swatches"] diff --git a/packages/python/plotly/_plotly_utils/colors/sequential.py b/packages/python/plotly/_plotly_utils/colors/sequential.py index f1aaae78215..bc408e47deb 100644 --- a/packages/python/plotly/_plotly_utils/colors/sequential.py +++ b/packages/python/plotly/_plotly_utils/colors/sequential.py @@ -162,3 +162,6 @@ def swatches(template=None): if _k.startswith("_") or _k == "swatches" or _k.endswith("_r"): continue globals()[_k + "_r"] = _cols[::-1] + + +__all__ = ["swatches"] diff --git a/packages/python/plotly/plotly/colors.py b/packages/python/plotly/plotly/colors.py deleted file mode 100644 index 76605dfa5e8..00000000000 --- a/packages/python/plotly/plotly/colors.py +++ /dev/null @@ -1,10 +0,0 @@ -from __future__ import absolute_import -from _plotly_utils.colors import * # noqa: F401 - -__all__ = [ - "named_colorscales", - "cyclical", - "diverging", - "sequential", - "qualitative", -] diff --git a/packages/python/plotly/plotly/colors/__init__.py b/packages/python/plotly/plotly/colors/__init__.py new file mode 100644 index 00000000000..4379f388a02 --- /dev/null +++ b/packages/python/plotly/plotly/colors/__init__.py @@ -0,0 +1,23 @@ +"""For a list of colors available in `plotly.colors`, please see + +* the `tutorial on discrete color sequences `_ +* the `list of built-in continuous color scales `_ + +Color scales are available within the following namespaces + +* cyclical +* diverging +* qualitative +* sequential +""" + +from __future__ import absolute_import +from _plotly_utils.colors import * # noqa: F401 + +__all__ = [ + "named_colorscales", + "cyclical", + "diverging", + "sequential", + "qualitative", +] diff --git a/packages/python/plotly/plotly/express/colors/__init__.py b/packages/python/plotly/plotly/express/colors/__init__.py index 993de8ecfbe..92933f4b0ee 100644 --- a/packages/python/plotly/plotly/express/colors/__init__.py +++ b/packages/python/plotly/plotly/express/colors/__init__.py @@ -5,9 +5,6 @@ Color scales are available within the following namespaces -* carto (``px.colors.carto``) -* cmocean -* colorbrewer * cyclical * diverging * qualitative diff --git a/packages/python/plotly/setup.py b/packages/python/plotly/setup.py index bc91e1c2197..33cfff8d49f 100644 --- a/packages/python/plotly/setup.py +++ b/packages/python/plotly/setup.py @@ -479,6 +479,7 @@ def run(self): "plotly.matplotlylib.mplexporter.renderers", "plotly.figure_factory", "plotly.data", + "plotly.colors", "plotly.express", "plotly.express.data", "plotly.express.colors", From ddf90b3358b9ce04b796e0b45379e2db93aa598a Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Tue, 26 May 2020 14:04:58 +0200 Subject: [PATCH 12/13] Update packages/python/plotly/plotly/colors/__init__.py Co-authored-by: Nicolas Kruchten --- packages/python/plotly/plotly/colors/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/python/plotly/plotly/colors/__init__.py b/packages/python/plotly/plotly/colors/__init__.py index 4379f388a02..dd9056e9500 100644 --- a/packages/python/plotly/plotly/colors/__init__.py +++ b/packages/python/plotly/plotly/colors/__init__.py @@ -3,7 +3,7 @@ * the `tutorial on discrete color sequences `_ * the `list of built-in continuous color scales `_ -Color scales are available within the following namespaces +Color scales and sequences are available within the following namespaces * cyclical * diverging From 1ee2237f2224637c907d605048fdc0e7788e5b59 Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Tue, 26 May 2020 14:28:46 +0200 Subject: [PATCH 13/13] Nic's comments --- doc/apidoc/index.rst | 1 + packages/python/plotly/plotly/colors/__init__.py | 1 + packages/python/plotly/plotly/express/colors/__init__.py | 1 + packages/python/plotly/plotly/express/data/__init__.py | 3 +++ 4 files changed, 6 insertions(+) diff --git a/doc/apidoc/index.rst b/doc/apidoc/index.rst index 87ad77a3fd9..e9c83e35fe8 100644 --- a/doc/apidoc/index.rst +++ b/doc/apidoc/index.rst @@ -18,6 +18,7 @@ Submodules * :ref:`Figure Factories: helper methods for building specific complex charts ` * :ref:`I/O: low-level interface for displaying, reading and writing figures ` * :mod:`plotly.colors`: colorscales and utility functions +* :mod:`plotly.data`: built-in datasets for demonstration, educational and test purposes Full reference list ------------------- diff --git a/packages/python/plotly/plotly/colors/__init__.py b/packages/python/plotly/plotly/colors/__init__.py index dd9056e9500..229326634d7 100644 --- a/packages/python/plotly/plotly/colors/__init__.py +++ b/packages/python/plotly/plotly/colors/__init__.py @@ -2,6 +2,7 @@ * the `tutorial on discrete color sequences `_ * the `list of built-in continuous color scales `_ +* the `tutorial on continuous colors `_ Color scales and sequences are available within the following namespaces diff --git a/packages/python/plotly/plotly/express/colors/__init__.py b/packages/python/plotly/plotly/express/colors/__init__.py index 92933f4b0ee..dafbee10e62 100644 --- a/packages/python/plotly/plotly/express/colors/__init__.py +++ b/packages/python/plotly/plotly/express/colors/__init__.py @@ -2,6 +2,7 @@ * the `tutorial on discrete color sequences `_ * the `list of built-in continuous color scales `_ +* the `tutorial on continuous colors `_ Color scales are available within the following namespaces diff --git a/packages/python/plotly/plotly/express/data/__init__.py b/packages/python/plotly/plotly/express/data/__init__.py index ae3ec606262..f4bc598bcb8 100644 --- a/packages/python/plotly/plotly/express/data/__init__.py +++ b/packages/python/plotly/plotly/express/data/__init__.py @@ -1,3 +1,6 @@ +"""Built-in datasets for demonstration, educational and test purposes. +""" + from __future__ import absolute_import from plotly.data import *