Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/check-js-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
cd js
npm ci
npm run build
npm ls
- name: Check JupyterLab build artifacts
run: |
# 1. Hash contents of all static files, sort by content hash
Expand Down
8 changes: 4 additions & 4 deletions codegen/resources/plot-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -4008,7 +4008,7 @@
"valType": "string"
},
"type": {
"description": "Sets the layer type, that is the how the layer data set in `source` will be rendered With `sourcetype` set to *geojson*, the following values are allowed: *circle*, *line*, *fill* and *symbol*. but note that *line* and *fill* are not compatible with Point GeoJSON geometries. With `sourcetype` set to *vector*, the following values are allowed: *circle*, *line*, *fill* and *symbol*. With `sourcetype` set to *raster* or `*image*`, only the *raster* value is allowed.",
"description": "Sets the layer type, that is the how the layer data set in `source` will be rendered With `sourcetype` set to *geojson*, the following values are allowed: *circle*, *line*, *fill* and *symbol*. but note that *line* and *fill* are not compatible with Point GeoJSON geometries. With `sourcetype` set to *vector*, the following values are allowed: *circle*, *line*, *fill* and *symbol*. With `sourcetype` set to *raster* or *image*, only the *raster* value is allowed.",
"dflt": "circle",
"editType": "plot",
"valType": "enumerated",
Expand Down Expand Up @@ -4414,7 +4414,7 @@
"valType": "string"
},
"type": {
"description": "Sets the layer type, that is the how the layer data set in `source` will be rendered With `sourcetype` set to *geojson*, the following values are allowed: *circle*, *line*, *fill* and *symbol*. but note that *line* and *fill* are not compatible with Point GeoJSON geometries. With `sourcetype` set to *vector*, the following values are allowed: *circle*, *line*, *fill* and *symbol*. With `sourcetype` set to *raster* or `*image*`, only the *raster* value is allowed.",
"description": "Sets the layer type, that is the how the layer data set in `source` will be rendered With `sourcetype` set to *geojson*, the following values are allowed: *circle*, *line*, *fill* and *symbol*. but note that *line* and *fill* are not compatible with Point GeoJSON geometries. With `sourcetype` set to *vector*, the following values are allowed: *circle*, *line*, *fill* and *symbol*. With `sourcetype` set to *raster* or *image*, only the *raster* value is allowed.",
"dflt": "circle",
"editType": "plot",
"valType": "enumerated",
Expand Down Expand Up @@ -47932,7 +47932,7 @@
"valType": "number"
},
"source": {
"description": "Specifies the data URI of the image to be visualized. The URI consists of \"data:image/[<media subtype>][;base64],<data>\"",
"description": "Specifies the data URI of the image to be visualized. The URI consists of \"data:image/[<media subtype\\\\>][;base64\\\\],<data\\\\>\"",
"editType": "calc",
"valType": "string"
},
Expand Down Expand Up @@ -53288,7 +53288,7 @@
]
},
"hovertemplate": {
"description": "Template string used for rendering the information that appear on hover box. Note that this will override `hoverinfo`. Variables are inserted using %{variable}, for example \"y: %{y}\" as well as %{xother}, {%_xother}, {%_xother_}, {%xother_}. When showing info for several points, *xother* will be added to those with different x positions from the first point. An underscore before or after *(x|y)other* will add a space on that side, only when this field is shown. Numbers are formatted using d3-format's syntax %{variable:d3-format}, for example \"Price: %{y:$.2f}\". https://github.com/d3/d3-format/tree/v1.4.5#d3-format for details on the formatting syntax. Dates are formatted using d3-time-format's syntax %{variable|d3-time-format}, for example \"Day: %{2019-01-01|%A}\". https://github.com/d3/d3-time-format/tree/v2.2.3#locale_format for details on the date formatting syntax. The variables available in `hovertemplate` are the ones emitted as event data described at this link https://plotly.com/javascript/plotlyjs-events/#event-data. Additionally, every attributes that can be specified per-point (the ones that are `arrayOk: true`) are available. This value here applies when hovering over dimensions. Note that `*categorycount`, *colorcount* and *bandcolorcount* are only available when `hoveron` contains the *color* flagFinally, the template string has access to variables `count`, `probability`, `category`, `categorycount`, `colorcount` and `bandcolorcount`. Anything contained in tag `<extra>` is displayed in the secondary box, for example `<extra>%{fullData.name}</extra>`. To hide the secondary box completely, use an empty tag `<extra></extra>`.",
"description": "Template string used for rendering the information that appear on hover box. Note that this will override `hoverinfo`. Variables are inserted using %{variable}, for example \"y: %{y}\" as well as %{xother}, {%_xother}, {%_xother_}, {%xother_}. When showing info for several points, *xother* will be added to those with different x positions from the first point. An underscore before or after *(x|y)other* will add a space on that side, only when this field is shown. Numbers are formatted using d3-format's syntax %{variable:d3-format}, for example \"Price: %{y:$.2f}\". https://github.com/d3/d3-format/tree/v1.4.5#d3-format for details on the formatting syntax. Dates are formatted using d3-time-format's syntax %{variable|d3-time-format}, for example \"Day: %{2019-01-01|%A}\". https://github.com/d3/d3-time-format/tree/v2.2.3#locale_format for details on the date formatting syntax. The variables available in `hovertemplate` are the ones emitted as event data described at this link https://plotly.com/javascript/plotlyjs-events/#event-data. Additionally, every attributes that can be specified per-point (the ones that are `arrayOk: true`) are available. This value here applies when hovering over dimensions. Note that *categorycount*, *colorcount* and *bandcolorcount* are only available when `hoveron` contains the *color* flag. Finally, the template string has access to variables `count`, `probability`, `category`, `categorycount`, `colorcount` and `bandcolorcount`. Anything contained in tag `<extra>` is displayed in the secondary box, for example `<extra>%{fullData.name}</extra>`. To hide the secondary box completely, use an empty tag `<extra></extra>`.",
"dflt": "",
"editType": "plot",
"valType": "string"
Expand Down
16 changes: 13 additions & 3 deletions commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,8 @@ def update_plotlyjs_dev(args, outdir):
perform_codegen(outdir)


def parse_args():
"""Parse command-line arguments."""
def make_parser():
"""Make argument parser."""

parser = argparse.ArgumentParser()
subparsers = parser.add_subparsers(dest="cmd", help="Available subcommands")
Expand All @@ -322,6 +322,11 @@ def parse_args():

subparsers.add_parser("updateplotlyjs", help="update plotly.js")

return parser


def parse_args(parser: argparse.ArgumentParser):
"""Parse command line arguments."""
return parser.parse_args()


Expand All @@ -331,7 +336,8 @@ def main():
project_root = os.path.dirname(os.path.realpath(__file__))
outdir = os.path.join(project_root, "plotly")

args = parse_args()
parser = make_parser()
args = parse_args(parser)

if args.cmd == "codegen":
perform_codegen(outdir, noformat=args.noformat)
Expand All @@ -350,6 +356,10 @@ def main():
print(version)
update_plotlyjs(version, outdir)

elif args.cmd is None:
parser.print_help()
sys.exit(1)

else:
print(f"unknown command {args.cmd}", file=sys.stderr)
sys.exit(1)
Expand Down
461 changes: 232 additions & 229 deletions js/lib/mimeExtension.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"lodash-es": "^4.17.21",
"plotly.js": "3.1.0",
"plotly.js": "3.1.1",
"@lumino/widgets": "~2.4.0"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions plotly/graph_objs/_figure.py
Original file line number Diff line number Diff line change
Expand Up @@ -9980,7 +9980,7 @@ def add_image(
source
Specifies the data URI of the image to be visualized.
The URI consists of "data:image/[<media
subtype>][;base64],<data>"
subtype\\>][;base64\\],<data\\>"
stream
:class:`plotly.graph_objects.image.Stream` instance or
dict with compatible properties
Expand Down Expand Up @@ -11853,9 +11853,9 @@ def add_parcats(
data. Additionally, every attributes that can be
specified per-point (the ones that are `arrayOk: true`)
are available. This value here applies when hovering
over dimensions. Note that `*categorycount`,
over dimensions. Note that "categorycount",
"colorcount" and "bandcolorcount" are only available
when `hoveron` contains the "color" flagFinally, the
when `hoveron` contains the "color" flag. Finally, the
template string has access to variables `count`,
`probability`, `category`, `categorycount`,
`colorcount` and `bandcolorcount`. Anything contained
Expand Down
6 changes: 3 additions & 3 deletions plotly/graph_objs/_figurewidget.py
Original file line number Diff line number Diff line change
Expand Up @@ -9982,7 +9982,7 @@ def add_image(
source
Specifies the data URI of the image to be visualized.
The URI consists of "data:image/[<media
subtype>][;base64],<data>"
subtype\\>][;base64\\],<data\\>"
stream
:class:`plotly.graph_objects.image.Stream` instance or
dict with compatible properties
Expand Down Expand Up @@ -11855,9 +11855,9 @@ def add_parcats(
data. Additionally, every attributes that can be
specified per-point (the ones that are `arrayOk: true`)
are available. This value here applies when hovering
over dimensions. Note that `*categorycount`,
over dimensions. Note that "categorycount",
"colorcount" and "bandcolorcount" are only available
when `hoveron` contains the "color" flagFinally, the
when `hoveron` contains the "color" flag. Finally, the
template string has access to variables `count`,
`probability`, `category`, `categorycount`,
`colorcount` and `bandcolorcount`. Anything contained
Expand Down
7 changes: 4 additions & 3 deletions plotly/graph_objs/_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,8 @@ def opacity(self, val):
def source(self):
"""
Specifies the data URI of the image to be visualized. The URI
consists of "data:image/[<media subtype>][;base64],<data>"
consists of "data:image/[<media
subtype\\>][;base64\\],<data\\>"

The 'source' property is a string and must be specified as:
- A string
Expand Down Expand Up @@ -1021,7 +1022,7 @@ def _prop_descriptions(self):
source
Specifies the data URI of the image to be visualized.
The URI consists of "data:image/[<media
subtype>][;base64],<data>"
subtype\\>][;base64\\],<data\\>"
stream
:class:`plotly.graph_objects.image.Stream` instance or
dict with compatible properties
Expand Down Expand Up @@ -1294,7 +1295,7 @@ def __init__(
source
Specifies the data URI of the image to be visualized.
The URI consists of "data:image/[<media
subtype>][;base64],<data>"
subtype\\>][;base64\\],<data\\>"
stream
:class:`plotly.graph_objects.image.Stream` instance or
dict with compatible properties
Expand Down
24 changes: 12 additions & 12 deletions plotly/graph_objs/_parcats.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,14 @@ def hovertemplate(self):
Additionally, every attributes that can be specified per-point
(the ones that are `arrayOk: true`) are available. This value
here applies when hovering over dimensions. Note that
`*categorycount`, "colorcount" and "bandcolorcount" are only
available when `hoveron` contains the "color" flagFinally, the
template string has access to variables `count`, `probability`,
`category`, `categorycount`, `colorcount` and `bandcolorcount`.
Anything contained in tag `<extra>` is displayed in the
secondary box, for example `<extra>%{fullData.name}</extra>`.
To hide the secondary box completely, use an empty tag
`<extra></extra>`.
"categorycount", "colorcount" and "bandcolorcount" are only
available when `hoveron` contains the "color" flag. Finally,
the template string has access to variables `count`,
`probability`, `category`, `categorycount`, `colorcount` and
`bandcolorcount`. Anything contained in tag `<extra>` is
displayed in the secondary box, for example
`<extra>%{fullData.name}</extra>`. To hide the secondary box
completely, use an empty tag `<extra></extra>`.

The 'hovertemplate' property is a string and must be specified as:
- A string
Expand Down Expand Up @@ -619,9 +619,9 @@ def _prop_descriptions(self):
data. Additionally, every attributes that can be
specified per-point (the ones that are `arrayOk: true`)
are available. This value here applies when hovering
over dimensions. Note that `*categorycount`,
over dimensions. Note that "categorycount",
"colorcount" and "bandcolorcount" are only available
when `hoveron` contains the "color" flagFinally, the
when `hoveron` contains the "color" flag. Finally, the
template string has access to variables `count`,
`probability`, `category`, `categorycount`,
`colorcount` and `bandcolorcount`. Anything contained
Expand Down Expand Up @@ -802,9 +802,9 @@ def __init__(
data. Additionally, every attributes that can be
specified per-point (the ones that are `arrayOk: true`)
are available. This value here applies when hovering
over dimensions. Note that `*categorycount`,
over dimensions. Note that "categorycount",
"colorcount" and "bandcolorcount" are only available
when `hoveron` contains the "color" flagFinally, the
when `hoveron` contains the "color" flag. Finally, the
template string has access to variables `count`,
`probability`, `category`, `categorycount`,
`colorcount` and `bandcolorcount`. Anything contained
Expand Down
6 changes: 3 additions & 3 deletions plotly/graph_objs/layout/map/_layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ def type(self):
with Point GeoJSON geometries. With `sourcetype` set to
"vector", the following values are allowed: "circle", "line",
"fill" and "symbol". With `sourcetype` set to "raster" or
`*image*`, only the "raster" value is allowed.
"image", only the "raster" value is allowed.

The 'type' property is an enumeration that may be specified as:
- One of the following enumeration values:
Expand Down Expand Up @@ -510,7 +510,7 @@ def _prop_descriptions(self):
geometries. With `sourcetype` set to "vector", the
following values are allowed: "circle", "line", "fill"
and "symbol". With `sourcetype` set to "raster" or
`*image*`, only the "raster" value is allowed.
"image", only the "raster" value is allowed.
visible
Determines whether this layer is displayed
"""
Expand Down Expand Up @@ -641,7 +641,7 @@ def __init__(
geometries. With `sourcetype` set to "vector", the
following values are allowed: "circle", "line", "fill"
and "symbol". With `sourcetype` set to "raster" or
`*image*`, only the "raster" value is allowed.
"image", only the "raster" value is allowed.
visible
Determines whether this layer is displayed

Expand Down
6 changes: 3 additions & 3 deletions plotly/graph_objs/layout/mapbox/_layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ def type(self):
with Point GeoJSON geometries. With `sourcetype` set to
"vector", the following values are allowed: "circle", "line",
"fill" and "symbol". With `sourcetype` set to "raster" or
`*image*`, only the "raster" value is allowed.
"image", only the "raster" value is allowed.

The 'type' property is an enumeration that may be specified as:
- One of the following enumeration values:
Expand Down Expand Up @@ -513,7 +513,7 @@ def _prop_descriptions(self):
geometries. With `sourcetype` set to "vector", the
following values are allowed: "circle", "line", "fill"
and "symbol". With `sourcetype` set to "raster" or
`*image*`, only the "raster" value is allowed.
"image", only the "raster" value is allowed.
visible
Determines whether this layer is displayed
"""
Expand Down Expand Up @@ -645,7 +645,7 @@ def __init__(
geometries. With `sourcetype` set to "vector", the
following values are allowed: "circle", "line", "fill"
and "symbol". With `sourcetype` set to "raster" or
`*image*`, only the "raster" value is allowed.
"image", only the "raster" value is allowed.
visible
Determines whether this layer is displayed

Expand Down
4 changes: 2 additions & 2 deletions plotly/labextension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"lodash-es": "^4.17.21",
"plotly.js": "3.1.0",
"plotly.js": "3.1.1",
"@lumino/widgets": "~2.4.0"
},
"devDependencies": {
Expand All @@ -32,7 +32,7 @@
"mimeExtension": true,
"outputDir": "../plotly/labextension",
"_build": {
"load": "static/remoteEntry.dbc48b0d53bfd4f2aa2d.js",
"load": "static/remoteEntry.ffd79dcb5f04e8fcf564.js",
"mimeExtension": "./mimeExtension"
}
}
Expand Down
2 changes: 2 additions & 0 deletions plotly/labextension/static/340.6ef45c5e0eac9143a6d4.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions plotly/labextension/static/340.e7c6cfbf008f29878868.js

This file was deleted.

Loading