Merge branch 'main' into update-hexbin-map-no-mapbox

Author: emilykl

.github/workflows/check-js-build.yml

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

codegen/resources/plot-schema.json

@@ -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",
@@ -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",
@@ -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"
     },
@@ -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"

commands.py

@@ -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")
@@ -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()
 
 
@@ -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)
@@ -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)

doc/python/imshow.md

@@ -5,10 +5,10 @@ jupyter:
     text_representation:
       extension: .md
       format_name: markdown
-      format_version: '1.2'
-      jupytext_version: 1.4.2
+      format_version: '1.3'
+      jupytext_version: 1.17.2
   kernelspec:
-    display_name: Python 3
+    display_name: Python 3 (ipykernel)
     language: python
     name: python3
   language_info:
@@ -20,7 +20,7 @@ jupyter:
     name: python
     nbconvert_exporter: python
     pygments_lexer: ipython3
-    version: 3.7.7
+    version: 3.12.0
   plotly:
     description: How to display image data in Python with Plotly.
     display_as: scientific
@@ -61,7 +61,7 @@ In order to create a numerical array to be passed to `px.imshow`, you can use a
 ```python
 import plotly.express as px
 from skimage import io
-img = io.imread('https://upload.wikimedia.org/wikipedia/commons/thumb/0/00/Crab_Nebula.jpg/240px-Crab_Nebula.jpg')
+img = io.imread('https://user-images.githubusercontent.com/72614349/179115668-2630e3e4-3a9f-4c88-9494-3412e606450a.jpg')
 fig = px.imshow(img)
 fig.show()
 ```

doc/python/plotly-express.md

@@ -6,7 +6,7 @@ jupyter:
       extension: .md
       format_name: markdown
       format_version: '1.3'
-      jupytext_version: 1.14.7
+      jupytext_version: 1.17.2
   kernelspec:
     display_name: Python 3 (ipykernel)
     language: python
@@ -20,7 +20,7 @@ jupyter:
     name: python
     nbconvert_exporter: python
     pygments_lexer: ipython3
-    version: 3.10.4
+    version: 3.12.0
   plotly:
     description: Plotly Express is a terse, consistent, high-level API for creating
       figures.
@@ -386,7 +386,7 @@ fig.show()
 ```python
 import plotly.express as px
 from skimage import io
-img = io.imread('https://upload.wikimedia.org/wikipedia/commons/thumb/0/00/Crab_Nebula.jpg/240px-Crab_Nebula.jpg')
+img = io.imread('https://user-images.githubusercontent.com/72614349/179115668-2630e3e4-3a9f-4c88-9494-3412e606450a.jpg')
 fig = px.imshow(img)
 fig.show()
 ```

doc/python/tile-scatter-maps.md

@@ -6,7 +6,7 @@ jupyter:
       extension: .md
       format_name: markdown
       format_version: '1.3'
-      jupytext_version: 1.16.3
+      jupytext_version: 1.16.4
   kernelspec:
     display_name: Python 3 (ipykernel)
     language: python
@@ -20,7 +20,7 @@ jupyter:
     name: python
     nbconvert_exporter: python
     pygments_lexer: ipython3
-    version: 3.10.0
+    version: 3.9.16
   plotly:
     description: How to make scatter plots on tile maps in Python.
     display_as: maps
@@ -220,6 +220,34 @@ fig.update_layout(
 fig.show()
 ```
 
+#### Supported Symbols
+
+Plotly uses [Maki v2.1.0](https://app.unpkg.com/maki@2.1.0/files/icons) for symbols and supports the following values for `symbol`:
+
+"aerialway", "airfield", "airport", "alcohol-shop", "america-football", 
+"amusement-park", "aquarium", "art-gallery", "attraction", "bakery",
+"bank", "bar", "baseball", "basketball", "beer", "bicycle", "bicycle-share",
+"blood-bank", "buddhism", "building", "bus", "cafe", "campsite", "car",
+"castle", "cemetery", "central-building", "cinema", "circle", "circle-stroked",
+"clothing-store", "college", "commercial", "cricket", "cross", "dam",
+"danger", "dentist", "doctor", "dog-park", "drinking-water", "embassy",
+"entrance", "farm", "fast-food", "ferry", "fire-station", "fuel", "gaming",
+"garden", "garden-center", "gift", "golf", "grocery", "hairdresser",
+"harbor", "heart", "heliport", "hospital", "ice-cream", "industry",
+"information", "karaoke", "landmark", "laundry", "library", "lighthouse",
+"lodging", "marker", "monument", "mountain", "museum", "music", "park",
+"parking", "parking-garage", "pharmacy", "picnic-site", "pitch",
+"place-of-worship", "playground", "police", "post", "prison", "rail",
+"rail-light", "rail-metro", "ranger-station", "religious-christian",
+"religious-jewish", "religious-muslim", "residential-community",
+"restaurant", "roadblock", "rocket", "school", "shelter", "shop",
+"skiing", "soccer", "square", "square-stroked", "stadium", "star",
+"star-stroked", "suitcase", "sushi", "swimming", "teahouse", "telephone",
+"tennis", "theatre", "toilet", "town-hall", "triangle", "triangle-stroked",
+"veterinary", "volcano", "warehouse", "waste-basket", "water", "wetland",
+"wheelchair", "zoo"
+
+
 #### Add Clusters
 
 *New in 5.11*

js/lib/mimeExtension.js

@@ -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": {

js/package-lock.json

@@ -382,7 +382,7 @@ def _contour_trace(
     ncontours=None,
     colorscale="Electric",
     linecolor="rgb(150,150,150)",
-    interp_mode="llr",
+    interp_mode="ilr",
     coloring=None,
     v_min=0,
     v_max=1,