Skip to content

Commit a8ef32e

Browse files
authored
Merge branch 'master' into better-pandas-warning
2 parents f377590 + 8c75004 commit a8ef32e

File tree

3,280 files changed

+169732
-30511
lines changed

Some content is hidden

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

3,280 files changed

+169732
-30511
lines changed

.circleci/config.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,20 @@ jobs:
234234
- test_optional:
235235
py: "39_pandas_2"
236236

237-
# Orca
238-
python_38_orca:
237+
# No numpy
238+
python_312_no_numpy:
239239
docker:
240-
- image: cimg/python:3.8-browsers
240+
- image: cimg/python:3.12-browsers
241241
steps:
242-
- test_orca:
243-
py: "38"
242+
- run:
243+
name: Check that numpy is not installed
244+
command: |
245+
if pip list | grep numpy > /dev/null 2>&1
246+
then exit 1
247+
else exit 0
248+
fi
249+
- test_optional:
250+
py: "312_no_numpy"
244251

245252
# Percy
246253
python_39_percy:
@@ -385,6 +392,8 @@ jobs:
385392
- run:
386393
name: Create conda environment
387394
command: |
395+
conda config --remove channels defaults
396+
conda config --add channels conda-forge
388397
conda create -n env --yes python=3.9 conda-build=3.28.4 conda-verify
389398
conda install -n env -c conda-forge jupyterlab=3 nodejs=16
390399
conda init bash
@@ -448,7 +457,7 @@ jobs:
448457
docker:
449458
# specify the version you desire here
450459
# use `-browsers` prefix for selenium tests, for example, `3.9-browsers`
451-
- image: cimg/python:3.10-browsers
460+
- image: cimg/python:3.9-browsers
452461

453462
steps:
454463
- add_ssh_keys:
@@ -596,7 +605,6 @@ workflows:
596605
- python_311_optional
597606
- python_312_optional
598607
- python_39_pandas_2_optional
599-
- python_38_orca
600608
- python_39_percy
609+
- python_312_no_numpy
601610
- build-doc
602-

CHANGELOG.md

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,46 @@
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-
## [5.23.0] - TBD
5+
### Updated
6+
7+
- Updated plotly.py to use base64 encoding of arrays in plotly JSON to improve performance.
8+
9+
## [5.24.1] - 2024-09-12
610

711
### Updated
12+
13+
- 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.
14+
15+
## [5.24.0] - 2024-08-29
16+
17+
### Added
18+
- New `px` functions for maps: `scatter_map`, `line_map`, `choropleth_map`, and `density_map`.
19+
20+
### Updated
21+
22+
- 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:
23+
- 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)]
24+
- Deprecate mapbox traces and mapbox subplot [[#7087](https://github.com/plotly/plotly.js/pull/7087)]
25+
26+
- Fixed a bug in integer validation of arrays that threw an error when an array contained a mix of strings and integers.
27+
28+
## [5.23.0] - 2024-07-23
29+
30+
### Updated
31+
- Updated Plotly.js from version 2.32.0 to version 2.34.0. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md#2340----2024-07-18) for more information. These changes are reflected in the auto-generated `plotly.graph_objects` module. Notable changes include:
32+
- Add `subtitle` attribute to `layout.title` to enable adding subtitles to plots [[#7012](https://github.com/plotly/plotly.js/pull/7012)]
33+
- Introduce "u" and "s" pseudo html tags to add partial underline and strike-through styles to SVG text elements [[#7043](https://github.com/plotly/plotly.js/pull/7043)]
34+
- Add geometric mean functionality and 'geometric mean ascending' + 'geometric mean descending' to `category_order` on cartesian axes [[#6223](https://github.com/plotly/plotly.js/pull/6223)],
35+
with thanks to @acxz and @prabhathc for the contribution!
36+
- Add axis property `ticklabelindex` for drawing the label for each minor tick n positions away from a major tick,
37+
with thanks to @my-tien for the contribution! [[#7036](https://github.com/plotly/plotly.js/pull/7036)]
38+
- Add property `ticklabelstandoff` and `ticklabelshift` to cartesian axes to adjust positioning of tick labels,
39+
with thanks to @my-tien for the contribution! [[#7006](https://github.com/plotly/plotly.js/pull/7006)]
40+
- Add `x0shift`, `x1shift`, `y0shift`, `y1shift` to shapes to add control over positioning of shape vertices on (multi-)category axes,
41+
with thanks to @my-tien for the contribution! [[#7005](https://github.com/plotly/plotly.js/pull/7005)]
842
- Specify Python version 3.8-3.11 for development virtual environments and pin `pytest` at version 8.1.1 to match.
43+
- Update `IntegerValidator` to handle `extras` option to allow supporting additional keyword values. For example, 'bold' and 'normal' as well as integers as used in font weights [#4612].
44+
945

1046
## [5.22.0] - 2024-05-01
1147

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: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,16 @@
3131
</tr>
3232
</table>
3333

34+
<div align="center">
35+
<a href="https://dash.plotly.com/project-maintenance">
36+
<img src="https://dash.plotly.com/assets/images/maintained-by-plotly.png" width="400px" alt="Maintained by Plotly">
37+
</a>
38+
</div>
39+
40+
3441
## Quickstart
3542

36-
`pip install plotly==5.22.0`
43+
`pip install plotly==5.24.1`
3744

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

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

8087
```
81-
pip install plotly==5.22.0
88+
pip install plotly==5.24.1
8289
```
8390

8491
or conda.
8592

8693
```
87-
conda install -c plotly plotly=5.22.0
94+
conda install -c plotly plotly=5.24.1
8895
```
8996

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

107114
```
108115
# JupyterLab 2.x renderer support
109-
jupyter labextension install jupyterlab-plotly@5.22.0 @jupyter-widgets/jupyterlab-manager
116+
jupyter labextension install jupyterlab-plotly@5.24.1 @jupyter-widgets/jupyterlab-manager
110117
```
111118

112119
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.22.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/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ help:
3636
# Remove files which were added only for docstring generation
3737
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
3838
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
39-
rename 's/graph_objs/graph_objects/' _build/html/*.html _build/html/generated/*.html
39+
rename 's/graph_objs/graph_objects/' _build/html/*.html _build/html/generated/*.html _build/html/generated/generated/*.html
4040
mv _build/html/generated/plotly.graph_objs.html _build/html/generated/plotly.graph_objects.html
4141
sed -i 's/graph_objs/graph_objects/g' _build/html/*.html
4242
sed -i 's/graph_objs/graph_objects/g' _build/html/*.inv

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.22.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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@ Map Traces
9999

100100
Scattergeo
101101
Choropleth
102+
Scattermap
103+
Choroplethmap
104+
Densitymap
102105
Scattermapbox
103106
Choroplethmapbox
104107
Densitymapbox

0 commit comments

Comments
 (0)