added links to px.data and px.colors in API doc

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,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 -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 

doc/apidoc/index.rst

@@ -17,6 +17,7 @@ Submodules
 * :ref:`Subplots: helper function for layout out multi-plot figures <subplots>`
 * :ref:`Figure Factories: helper methods for building specific complex charts <ff>`
 * :ref:`I/O: low-level interface for displaying, reading and writing figures <io>`
+* :mod:`plotly.colors`: colorscales and utility functions
 
 Full reference list
 -------------------

doc/apidoc/plotly.express.rst

@@ -1,7 +1,7 @@
 .. _px:
 
 `plotly.express`: high-level interface for data visualization
-================================
+=============================================================
 
 The `plotly.express <https://plot.ly/python/plotly-express/>`_ module is
 plotly's high-level API for rapid figure generation. ::
@@ -49,4 +49,12 @@ plotly's high-level API for rapid figure generation. ::
     imshow
 
 
+`plotly.express` subpackages
+---------------------------
 
+
+.. toctree::
+   :maxdepth: 1
+
+   generated/plotly.express.data.rst
+   generated/plotly.express.colors.rst

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",
+]

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"]

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"]

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"]

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 <https://plotly.com/python/discrete-color/#color-sequences-in-plotly-express>`_
+* the `list of built-in continuous color scales <https://plotly.com/python/builtin-colorscales/>`_
+
+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",
+]

packages/python/plotly/plotly/express/_core.py

@@ -4,7 +4,7 @@
 from ._special_inputs import IdentityMap, Constant, Range
 
 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

packages/python/plotly/plotly/express/colors/__init__.py

@@ -0,0 +1,24 @@
+"""For a list of colors available in `plotly.express.colors`, please see
+
+* the `tutorial on discrete color sequences <https://plotly.com/python/discrete-color/#color-sequences-in-plotly-express>`_
+* the `list of built-in continuous color scales <https://plotly.com/python/builtin-colorscales/>`_
+
+Color scales are available within the following namespaces
+
+* cyclical
+* diverging
+* qualitative
+* sequential
+"""
+
+from __future__ import absolute_import
+from plotly.colors import *
+
+
+__all__ = [
+    "named_colorscales",
+    "cyclical",
+    "diverging",
+    "sequential",
+    "qualitative",
+]

packages/python/plotly/plotly/express/data/__init__.py

@@ -0,0 +1,12 @@
+from __future__ import absolute_import
+from plotly.data import *
+
+__all__ = [
+    "carshare",
+    "election",
+    "election_geojson",
+    "gapminder",
+    "iris",
+    "tips",
+    "wind",
+]

packages/python/plotly/setup.py

@@ -479,7 +479,10 @@ def run(self):
         "plotly.matplotlylib.mplexporter.renderers",
         "plotly.figure_factory",
         "plotly.data",
+        "plotly.colors",
         "plotly.express",
+        "plotly.express.data",
+        "plotly.express.colors",
         "plotly.graph_objects",
         "_plotly_utils",
         "_plotly_utils.colors",