Skip to content

Commit 0480261

Browse files
committed
Merge branch 'master' of github.com:plotly/plotly.py into np2
2 parents 04737d1 + 31b3ad8 commit 0480261

File tree

1,485 files changed

+80237
-57583
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,485 files changed

+80237
-57583
lines changed

.circleci/config.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -249,14 +249,6 @@ jobs:
249249
- test_optional:
250250
py: "312_no_numpy"
251251

252-
# Orca
253-
python_38_orca:
254-
docker:
255-
- image: cimg/python:3.8-browsers
256-
steps:
257-
- test_orca:
258-
py: "38"
259-
260252
# Percy
261253
python_39_percy:
262254
docker:
@@ -400,6 +392,8 @@ jobs:
400392
- run:
401393
name: Create conda environment
402394
command: |
395+
conda config --remove channels defaults
396+
conda config --add channels conda-forge
403397
conda create -n env --yes python=3.9 conda-build=3.28.4 conda-verify
404398
conda install -n env -c conda-forge jupyterlab=3 nodejs=16
405399
conda init bash
@@ -463,7 +457,7 @@ jobs:
463457
docker:
464458
# specify the version you desire here
465459
# use `-browsers` prefix for selenium tests, for example, `3.9-browsers`
466-
- image: cimg/python:3.10-browsers
460+
- image: cimg/python:3.9-browsers
467461

468462
steps:
469463
- add_ssh_keys:
@@ -611,8 +605,6 @@ workflows:
611605
- python_311_optional
612606
- python_312_optional
613607
- python_39_pandas_2_optional
614-
- python_38_orca
615608
- python_39_percy
616609
- python_312_no_numpy
617610
- build-doc
618-

CHANGELOG.md

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,37 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5-
## UNRELEASED
5+
### Removed
6+
- Drop deprecated `pointcloud` and `heatmapgl` traces from the API
7+
- Drop `tenacity` dependency [#4831](https://github.com/plotly/plotly.js/pull/4831)
8+
9+
### Updated
10+
11+
- Updated plotly.py to use base64 encoding of arrays in plotly JSON to improve performance.
12+
13+
## [5.24.1] - 2024-09-12
614

715
### Updated
16+
17+
- Updated Plotly.js from version 2.35.0 to version 2.35.2. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md#2352----2024-09-10) for more information.
18+
19+
## [5.24.0] - 2024-08-29
20+
21+
### Added
22+
- New `px` functions for maps: `scatter_map`, `line_map`, `choropleth_map`, and `density_map`.
23+
24+
### Updated
25+
26+
- Updated Plotly.js from version 2.34.0 to version 2.35.0. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md#2350----2024-08-29) for more information. These changes are reflected in the auto-generated `plotly.graph_objects` module. Notable changes include:
27+
- Add new traces: scattermap, choroplethmap and densitymap and map subplots which use maplibre to render maps [[#7015](https://github.com/plotly/plotly.js/pull/7015), [#7060](https://github.com/plotly/plotly.js/pull/7060), [#7085](https://github.com/plotly/plotly.js/pull/7085), [#7088](https://github.com/plotly/plotly.js/pull/7088), [#7090](https://github.com/plotly/plotly.js/pull/7090), [#7092](https://github.com/plotly/plotly.js/pull/7092), [#7094](https://github.com/plotly/plotly.js/pull/7094), [#7134](https://github.com/plotly/plotly.js/pull/7134)]
28+
- Deprecate mapbox traces and mapbox subplot [[#7087](https://github.com/plotly/plotly.js/pull/7087)]
29+
830
- Fixed a bug in integer validation of arrays that threw an error when an array contained a mix of strings and integers.
931

32+
- Fixed a bug in JupyterLab >= 4 and Jupyter Notebook >= 7 that caused latex to not render in plotly charts.
33+
34+
- Use modern [native ES6 import](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules) to load plotly.js bundle instead of requirejs which is [no longer under active development](https://github.com/requirejs/r.js/compare/2.3.6...2.3.7)
35+
1036
## [5.23.0] - 2024-07-23
1137

1238
### Updated

LICENSE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
The MIT License (MIT)
1+
MIT License
22

3-
Copyright (c) 2016-2018 Plotly, Inc
3+
Copyright (c) 2016-2024 Plotly Technologies Inc.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
## Quickstart
4242

43-
`pip install plotly==5.23.0`
43+
`pip install plotly==5.24.1`
4444

4545
Inside [Jupyter](https://jupyter.org/install) (installable with `pip install "jupyterlab>=3" "ipywidgets>=7.6"`):
4646

@@ -85,13 +85,13 @@ Built on top of [plotly.js](https://github.com/plotly/plotly.js), `plotly.py` is
8585
plotly.py may be installed using pip...
8686

8787
```
88-
pip install plotly==5.23.0
88+
pip install plotly==5.24.1
8989
```
9090

9191
or conda.
9292

9393
```
94-
conda install -c plotly plotly=5.23.0
94+
conda install -c plotly plotly=5.24.1
9595
```
9696

9797
### JupyterLab Support
@@ -113,7 +113,7 @@ The instructions above apply to JupyterLab 3.x. **For JupyterLab 2 or earlier**,
113113

114114
```
115115
# JupyterLab 2.x renderer support
116-
jupyter labextension install jupyterlab-plotly@5.23.0 @jupyter-widgets/jupyterlab-manager
116+
jupyter labextension install jupyterlab-plotly@5.24.1 @jupyter-widgets/jupyterlab-manager
117117
```
118118

119119
Please check out our [Troubleshooting guide](https://plotly.com/python/troubleshooting/) if you run into any problems with JupyterLab.

binder/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
jupytext
2-
plotly==5.23.0
2+
plotly==5.24.1
33
jupyter
44
notebook
55
pandas==2.2.2

contributing.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ There are many ways to contribute to plotly.py. To contribute effectively, it is
5757

5858
- tests are found in `packages/python/plotly/plotly/tests`. Different
5959
directories correspond to different test jobs (with different dependency sets)
60-
run in continuous integration. These jobs are configured in
61-
`packages/python/plotly/tox.ini`, which itself is used in the Circle CI
62-
configuration file `.circleci/config.yml`. More is explained about tests
60+
run in continuous integration. More is explained about tests
6361
in the following "Technical aspects" section.
6462

6563
- the **documentation** is part of this repository. Its structure and some
@@ -231,10 +229,10 @@ For dev branches, it is also possible to use `updateplotlyjsdev` in two configur
231229

232230
### CircleCI Release
233231

234-
If your devbranch is part of the official plotly.js repository, you can use
232+
If your devbranch is part of the official plotly.js repository, you can use
235233
```bash
236234
python setup.py updateplotlyjsdev --devrepo reponame --devbranch branchname
237-
```
235+
```
238236
to update to development versions of `plotly.js`. This will fetch the `plotly.js` in the CircleCI artifact of the branch `branchname` of the repo `reponame`. If `--devrepo` or `--devbranch` are omitted, `updateplotlyjsdev` defaults using `plotly/plotly.js` and `master` respectively.
239237

240238
### Local Repository

doc/apidoc/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# The short X.Y version
2727
version = ""
2828
# The full version, including alpha/beta/rc tags
29-
release = "5.23.0"
29+
release = "5.24.1"
3030

3131

3232
# -- General configuration ---------------------------------------------------

doc/apidoc/plotly.express.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ plotly's high-level API for rapid figure generation. ::
1818
scatter_3d
1919
scatter_polar
2020
scatter_ternary
21+
scatter_map
2122
scatter_mapbox
2223
scatter_geo
2324
line
2425
line_3d
2526
line_polar
2627
line_ternary
28+
line_map
2729
line_mapbox
2830
line_geo
2931
area
@@ -45,9 +47,11 @@ plotly's high-level API for rapid figure generation. ::
4547
parallel_coordinates
4648
parallel_categories
4749
choropleth
50+
choropleth_map
4851
choropleth_mapbox
4952
density_contour
5053
density_heatmap
54+
density_map
5155
density_mapbox
5256
imshow
5357
set_mapbox_access_token

doc/apidoc/plotly.graph_objects.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ Simple Traces
4343
Bar
4444
Pie
4545
Heatmap
46-
Heatmapgl
4746
Image
4847
Contour
4948
Table
@@ -99,6 +98,9 @@ Map Traces
9998

10099
Scattergeo
101100
Choropleth
101+
Scattermap
102+
Choroplethmap
103+
Densitymap
102104
Scattermapbox
103105
Choroplethmapbox
104106
Densitymapbox

doc/python/3d-bubble-charts.md

Lines changed: 69 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ jupyter:
55
text_representation:
66
extension: .md
77
format_name: markdown
8-
format_version: '1.1'
9-
jupytext_version: 1.2.3
8+
format_version: '1.3'
9+
jupytext_version: 1.16.4
1010
kernelspec:
11-
display_name: Python 3
11+
display_name: Python 3 (ipykernel)
1212
language: python
1313
name: python3
1414
language_info:
@@ -20,7 +20,7 @@ jupyter:
2020
name: python
2121
nbconvert_exporter: python
2222
pygments_lexer: ipython3
23-
version: 3.7.3
23+
version: 3.11.10
2424
plotly:
2525
description: How to make 3D Bubble Charts in Python with Plotly. Three examples
2626
of 3D Bubble Charts.
@@ -113,12 +113,38 @@ fig = go.Figure(data=go.Scatter3d(
113113
)
114114
))
115115

116-
fig.update_layout(width=800, height=800, title = 'Planets!',
117-
scene = dict(xaxis=dict(title='Distance from Sun', titlefont_color='white'),
118-
yaxis=dict(title='Density', titlefont_color='white'),
119-
zaxis=dict(title='Gravity', titlefont_color='white'),
120-
bgcolor = 'rgb(20, 24, 54)'
121-
))
116+
fig.update_layout(
117+
width=800,
118+
height=800,
119+
title="Planets!",
120+
scene=dict(
121+
xaxis=dict(
122+
title=dict(
123+
text="Distance from Sun",
124+
font=dict(
125+
color="white"
126+
)
127+
)
128+
),
129+
yaxis=dict(
130+
title=dict(
131+
text="Density",
132+
font=dict(
133+
color="white"
134+
)
135+
)
136+
),
137+
zaxis=dict(
138+
title=dict(
139+
text="Gravity",
140+
font=dict(
141+
color="white"
142+
)
143+
)
144+
),
145+
bgcolor="rgb(20, 24, 54)"
146+
)
147+
)
122148

123149
fig.show()
124150
```
@@ -154,16 +180,42 @@ fig = go.Figure(go.Scatter3d(
154180
)
155181
))
156182

157-
fig.update_layout(width=800, height=800, title = 'Planets!',
158-
scene = dict(xaxis=dict(title='Distance from Sun', titlefont_color='white'),
159-
yaxis=dict(title='Density', titlefont_color='white'),
160-
zaxis=dict(title='Gravity', titlefont_color='white'),
161-
bgcolor = 'rgb(20, 24, 54)'
162-
))
183+
fig.update_layout(
184+
width=800,
185+
height=800,
186+
title="Planets!",
187+
scene=dict(
188+
xaxis=dict(
189+
title=dict(
190+
text="Distance from Sun",
191+
font=dict(
192+
color="white"
193+
)
194+
)
195+
),
196+
yaxis=dict(
197+
title=dict(
198+
text="Density",
199+
font=dict(
200+
color="white"
201+
)
202+
)
203+
),
204+
zaxis=dict(
205+
title=dict(
206+
text="Gravity",
207+
font=dict(
208+
color="white"
209+
)
210+
)
211+
),
212+
bgcolor="rgb(20, 24, 54)"
213+
)
214+
)
163215

164216
fig.show()
165217
```
166218

167219
#### Reference
168220

169-
See https://plotly.com/python/reference/scatter3d/ and https://plotly.com/python/reference/scatter/#scatter-marker-sizeref <br>for more information and chart attribute options!
221+
See https://plotly.com/python/reference/scatter3d/ and https://plotly.com/python/reference/scatter/#scatter-marker-sizeref <br>for more information and chart attribute options!

0 commit comments

Comments
 (0)