From 763bf27764104fb94288c730a7b7c34f2276627c Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Wed, 27 May 2020 21:31:54 +0200 Subject: [PATCH 1/3] complete the API of plotly.colors and plotly.express.colors --- doc/apidoc/Makefile | 8 +++---- .../python/plotly/plotly/colors/__init__.py | 22 +++++++++++++++++++ .../plotly/plotly/express/colors/__init__.py | 22 +++++++++++++++++++ 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/doc/apidoc/Makefile b/doc/apidoc/Makefile index cf5cb7ebdc9..2581f378c14 100644 --- a/doc/apidoc/Makefile +++ b/doc/apidoc/Makefile @@ -22,13 +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 - 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 + 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_utils/colors/colorbrewer.py ../../packages/python/plotly/_plotly_utils/colors/carto.py ../../packages/python/plotly/_plotly_utils/colors/cmocean.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_utils/colors/colorbrewer.py ../../packages/python/plotly/_plotly_utils/colors/carto.py ../../packages/python/plotly/_plotly_utils/colors/cmocean.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 + 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 ../../packages/python/plotly/plotly/colors/colorbrewer.py ../../packages/python/plotly/plotly/colors/carto.py ../../packages/python/plotly/plotly/colors/cmocean.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 ../../packages/python/plotly/plotly/express/colors/colorbrewer.py ../../packages/python/plotly/plotly/express/colors/carto.py ../../packages/python/plotly/plotly/express/colors/cmocean.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/packages/python/plotly/plotly/colors/__init__.py b/packages/python/plotly/plotly/colors/__init__.py index 229326634d7..e84e8a78075 100644 --- a/packages/python/plotly/plotly/colors/__init__.py +++ b/packages/python/plotly/plotly/colors/__init__.py @@ -21,4 +21,26 @@ "diverging", "sequential", "qualitative", + "colorbrewer", + "carto", + "cmocean", + 'carto', + 'color_parser', + 'colorscale_to_colors', + 'colorscale_to_scale', + 'convert_colors_to_same_type', + 'convert_colorscale_to_rgb', + 'convert_dict_colors_to_same_type', + 'convert_to_RGB_255', + 'find_intermediate_color', + 'hex_to_rgb', + 'label_rgb', + 'make_colorscale', + 'n_colors', + 'unconvert_from_RGB_255', + 'unlabel_rgb', + 'validate_colors', + 'validate_colors_dict', + 'validate_colorscale', + 'validate_scale_values' ] diff --git a/packages/python/plotly/plotly/express/colors/__init__.py b/packages/python/plotly/plotly/express/colors/__init__.py index dafbee10e62..bf2c6da3f6a 100644 --- a/packages/python/plotly/plotly/express/colors/__init__.py +++ b/packages/python/plotly/plotly/express/colors/__init__.py @@ -22,4 +22,26 @@ "diverging", "sequential", "qualitative", + "colorbrewer", + "colorbrewer", + "carto", + "cmocean", + 'color_parser', + 'colorscale_to_colors', + 'colorscale_to_scale', + 'convert_colors_to_same_type', + 'convert_colorscale_to_rgb', + 'convert_dict_colors_to_same_type', + 'convert_to_RGB_255', + 'find_intermediate_color', + 'hex_to_rgb', + 'label_rgb', + 'make_colorscale', + 'n_colors', + 'unconvert_from_RGB_255', + 'unlabel_rgb', + 'validate_colors', + 'validate_colors_dict', + 'validate_colorscale', + 'validate_scale_values' ] From 35cff37c8fb52e7919825bf5cc5c7caf915dabde Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Wed, 27 May 2020 21:42:25 +0200 Subject: [PATCH 2/3] blacken --- .../python/plotly/plotly/colors/__init__.py | 38 +++++++++---------- .../plotly/plotly/express/colors/__init__.py | 36 +++++++++--------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/python/plotly/plotly/colors/__init__.py b/packages/python/plotly/plotly/colors/__init__.py index e84e8a78075..50478444f55 100644 --- a/packages/python/plotly/plotly/colors/__init__.py +++ b/packages/python/plotly/plotly/colors/__init__.py @@ -24,23 +24,23 @@ "colorbrewer", "carto", "cmocean", - 'carto', - 'color_parser', - 'colorscale_to_colors', - 'colorscale_to_scale', - 'convert_colors_to_same_type', - 'convert_colorscale_to_rgb', - 'convert_dict_colors_to_same_type', - 'convert_to_RGB_255', - 'find_intermediate_color', - 'hex_to_rgb', - 'label_rgb', - 'make_colorscale', - 'n_colors', - 'unconvert_from_RGB_255', - 'unlabel_rgb', - 'validate_colors', - 'validate_colors_dict', - 'validate_colorscale', - 'validate_scale_values' + "carto", + "color_parser", + "colorscale_to_colors", + "colorscale_to_scale", + "convert_colors_to_same_type", + "convert_colorscale_to_rgb", + "convert_dict_colors_to_same_type", + "convert_to_RGB_255", + "find_intermediate_color", + "hex_to_rgb", + "label_rgb", + "make_colorscale", + "n_colors", + "unconvert_from_RGB_255", + "unlabel_rgb", + "validate_colors", + "validate_colors_dict", + "validate_colorscale", + "validate_scale_values", ] diff --git a/packages/python/plotly/plotly/express/colors/__init__.py b/packages/python/plotly/plotly/express/colors/__init__.py index bf2c6da3f6a..9589ff43bb2 100644 --- a/packages/python/plotly/plotly/express/colors/__init__.py +++ b/packages/python/plotly/plotly/express/colors/__init__.py @@ -26,22 +26,22 @@ "colorbrewer", "carto", "cmocean", - 'color_parser', - 'colorscale_to_colors', - 'colorscale_to_scale', - 'convert_colors_to_same_type', - 'convert_colorscale_to_rgb', - 'convert_dict_colors_to_same_type', - 'convert_to_RGB_255', - 'find_intermediate_color', - 'hex_to_rgb', - 'label_rgb', - 'make_colorscale', - 'n_colors', - 'unconvert_from_RGB_255', - 'unlabel_rgb', - 'validate_colors', - 'validate_colors_dict', - 'validate_colorscale', - 'validate_scale_values' + "color_parser", + "colorscale_to_colors", + "colorscale_to_scale", + "convert_colors_to_same_type", + "convert_colorscale_to_rgb", + "convert_dict_colors_to_same_type", + "convert_to_RGB_255", + "find_intermediate_color", + "hex_to_rgb", + "label_rgb", + "make_colorscale", + "n_colors", + "unconvert_from_RGB_255", + "unlabel_rgb", + "validate_colors", + "validate_colors_dict", + "validate_colorscale", + "validate_scale_values", ] From 3e3c677e73615f5db039dd989262dac25eb70f13 Mon Sep 17 00:00:00 2001 From: Emmanuelle Gouillart Date: Thu, 28 May 2020 14:35:29 +0200 Subject: [PATCH 3/3] default colorscales --- packages/python/plotly/plotly/colors/__init__.py | 4 +++- packages/python/plotly/plotly/express/colors/__init__.py | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/python/plotly/plotly/colors/__init__.py b/packages/python/plotly/plotly/colors/__init__.py index 50478444f55..2e3dc753e6b 100644 --- a/packages/python/plotly/plotly/colors/__init__.py +++ b/packages/python/plotly/plotly/colors/__init__.py @@ -24,7 +24,6 @@ "colorbrewer", "carto", "cmocean", - "carto", "color_parser", "colorscale_to_colors", "colorscale_to_scale", @@ -43,4 +42,7 @@ "validate_colors_dict", "validate_colorscale", "validate_scale_values", + "plotlyjs", + "DEFAULT_PLOTLY_COLORS", + "PLOTLY_SCALES", ] diff --git a/packages/python/plotly/plotly/express/colors/__init__.py b/packages/python/plotly/plotly/express/colors/__init__.py index 9589ff43bb2..b77c21c03be 100644 --- a/packages/python/plotly/plotly/express/colors/__init__.py +++ b/packages/python/plotly/plotly/express/colors/__init__.py @@ -44,4 +44,7 @@ "validate_colors_dict", "validate_colorscale", "validate_scale_values", + "plotlyjs", + "DEFAULT_PLOTLY_COLORS", + "PLOTLY_SCALES", ]