Merge branch 'master' of github.com:plotly/plotly.py into anywidget

Author: marthacryan

LICENSE.txt

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2016-2018 Plotly, Inc
+Copyright (c) 2016-2024 Plotly Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

doc/python/renderers.md

@@ -164,7 +164,7 @@ The `plotly_mimetype` renderer creates a specification of the figure (called a M
 These are aliases for `plotly_mimetype` since this renderer is a good choice when working in JupyterLab, nteract, and the Visual Studio Code notebook interface. Note that in VSCode Notebooks, the version of Plotly.js that is used to render is provided by the [vscode-python extension](https://code.visualstudio.com/docs/languages/python) and often trails the latest version by several weeks, so the latest features of `plotly` may not be available in VSCode right away. The situation is similar for Nteract.
 
 ##### Static Image Renderers
-A set of renderers is provided for displaying figures as static images.  These renderers all rely on the [orca](https://github.com/plotly/orca) static image export utility. See the [Static Image Export](https://plot.ly/python/static-image-export/) page for more information on getting set up with [orca].
+A set of renderers is provided for displaying figures as static images. See the [Static Image Export](https://plot.ly/python/static-image-export/) page for more information on getting set up.
 
 ###### `png`, `jpeg`, and `svg`
 These renderers display figures as static `.png`, `.jpeg`, and `.svg` files, respectively.  These renderers are useful for user interfaces that do not support inline HTML output, but do support inline static images.  Examples include the [QtConsole](https://qtconsole.readthedocs.io/en/stable/), [Spyder](https://www.spyder-ide.org/), and the PyCharm [notebook interface](https://www.jetbrains.com/help/pycharm/jupyter-notebook-support.html).

packages/python/chart-studio/chart_studio/tools.py

@@ -287,7 +287,7 @@ def _get_embed_url(file_owner_or_url, file_id=None):
             "The 'file_id' argument must be a non-negative number."
         )
 
-    if share_key is "":
+    if share_key == "":
         return "{plotly_rest_url}/~{file_owner}/{file_id}.embed".format(
             plotly_rest_url=plotly_rest_url, file_owner=file_owner, file_id=file_id
         )

packages/python/plotly/plotly/express/_chart_types.py

@@ -258,7 +258,7 @@ def line(
     height=None,
 ) -> go.Figure:
     """
-    In a 2D line plot, each row of `data_frame` is represented as vertex of
+    In a 2D line plot, each row of `data_frame` is represented as a vertex of
     a polyline mark in 2D space.
     """
     return make_figure(args=locals(), constructor=go.Scatter)
@@ -309,8 +309,8 @@ def area(
 ) -> go.Figure:
     """
     In a stacked area plot, each row of `data_frame` is represented as
-    vertex of a polyline mark in 2D space. The area between successive
-    polylines is filled.
+    a vertex of a polyline mark in 2D space. The area between
+    successive polylines is filled.
     """
     return make_figure(
         args=locals(),
@@ -821,7 +821,7 @@ def line_3d(
     height=None,
 ) -> go.Figure:
     """
-    In a 3D line plot, each row of `data_frame` is represented as vertex of
+    In a 3D line plot, each row of `data_frame` is represented as a vertex of
     a polyline mark in 3D space.
     """
     return make_figure(args=locals(), constructor=go.Scatter3d)
@@ -902,7 +902,7 @@ def line_ternary(
 ) -> go.Figure:
     """
     In a ternary line plot, each row of `data_frame` is represented as
-    vertex of a polyline mark in ternary coordinates.
+    a vertex of a polyline mark in ternary coordinates.
     """
     return make_figure(args=locals(), constructor=go.Scatterternary)
 
@@ -992,8 +992,8 @@ def line_polar(
     height=None,
 ) -> go.Figure:
     """
-    In a polar line plot, each row of `data_frame` is represented as vertex
-    of a polyline mark in polar coordinates.
+    In a polar line plot, each row of `data_frame` is represented as a
+    vertex of a polyline mark in polar coordinates.
     """
     return make_figure(args=locals(), constructor=go.Scatterpolar)
 
@@ -1199,7 +1199,7 @@ def line_geo(
 ) -> go.Figure:
     """
     In a geographic line plot, each row of `data_frame` is represented as
-    vertex of a polyline mark on a map.
+    a vertex of a polyline mark on a map.
     """
     return make_figure(
         args=locals(),
@@ -1314,7 +1314,7 @@ def density_map(
 ) -> go.Figure:
     """
     In a density map, each row of `data_frame` contributes to the intensity of
-    the color of the region around the corresponding point on the map
+    the color of the region around the corresponding point on the map.
     """
     return make_figure(
         args=locals(), constructor=go.Densitymap, trace_patch=dict(radius=radius)
@@ -1350,7 +1350,7 @@ def line_map(
 ) -> go.Figure:
     """
     In a line map, each row of `data_frame` is represented as
-    vertex of a polyline mark on the map.
+    a vertex of a polyline mark on the map.
     """
     return make_figure(args=locals(), constructor=go.Scattermap)
 
@@ -1497,7 +1497,7 @@ def line_mapbox(
 ) -> go.Figure:
     """
     In a Mapbox line plot, each row of `data_frame` is represented as
-    vertex of a polyline mark on a Mapbox map.
+    a vertex of a polyline mark on a Mapbox map.
     """
     return make_figure(args=locals(), constructor=go.Scattermapbox)
 

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

@@ -1236,7 +1236,7 @@ def process_args_into_dataframe(args, wide_mode, var_name, value_name):
                     raise ValueError(
                         "All arguments should have the same length. "
                         "The length of column argument `df[%s]` is %d, whereas the "
-                        "length of  previously-processed arguments %s is %d"
+                        "length of previously-processed arguments %s is %d"
                         % (
                             field,
                             len(df_input[argument]),
@@ -1274,7 +1274,7 @@ def process_args_into_dataframe(args, wide_mode, var_name, value_name):
                     raise ValueError(
                         "All arguments should have the same length. "
                         "The length of argument `%s` is %d, whereas the "
-                        "length of  previously-processed arguments %s is %d"
+                        "length of previously-processed arguments %s is %d"
                         % (field, len(argument), str(list(df_output.keys())), length)
                     )
                 df_output[str(col_name)] = to_unindexed_series(argument, str(col_name))

test/percy/plotly-express.py

@@ -384,7 +384,7 @@
 
 
 carshare = px.data.carshare()
-fig = px.scatter_mapbox(
+fig = px.scatter_map(
     carshare,
     lat="centroid_lat",
     lon="centroid_lon",
@@ -394,14 +394,12 @@
     size_max=15,
     zoom=10,
 )
-fig.write_html(os.path.join(dir_name, "scatter_mapbox.html"))
+fig.write_html(os.path.join(dir_name, "scatter_map.html"))
 
 
 carshare = px.data.carshare()
-fig = px.line_mapbox(
-    carshare, lat="centroid_lat", lon="centroid_lon", color="peak_hour"
-)
-fig.write_html(os.path.join(dir_name, "line_mapbox.html"))
+fig = px.line_map(carshare, lat="centroid_lat", lon="centroid_lon", color="peak_hour")
+fig.write_html(os.path.join(dir_name, "line_map.html"))
 
 
 sample_geojson = {
@@ -419,23 +417,23 @@
         }
     ],
 }
-fig = px.choropleth_mapbox(
+fig = px.choropleth_map(
     geojson=sample_geojson,
     locations=["the_polygon"],
     color=[10],
     zoom=6,
 )
-fig.write_html(os.path.join(dir_name, "choropleth_mapbox.html"), auto_play=False)
+fig.write_html(os.path.join(dir_name, "choropleth_map.html"), auto_play=False)
 
 
 carshare = px.data.carshare()
-fig = px.density_mapbox(
+fig = px.density_map(
     carshare,
     lat="centroid_lat",
     lon="centroid_lon",
     z="peak_hour",
 )
-fig.write_html(os.path.join(dir_name, "density_mapbox.html"), auto_play=False)
+fig.write_html(os.path.join(dir_name, "density_map.html"), auto_play=False)
 
 
 gapminder = px.data.gapminder()