Skip to content

Commit 31df48f

Browse files
Merge branch 'plotly:master' into master
2 parents adb108f + 7b15316 commit 31df48f

File tree

5,555 files changed

+306300
-79496
lines changed

Some content is hidden

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

5,555 files changed

+306300
-79496
lines changed

Diff for: .circleci/config.yml

+266-112
Large diffs are not rendered by default.

Diff for: .flake8

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[flake8]
2+
max-line-length = 88

Diff for: .gitignore

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
0
2+
0.html
3+
iframe_figures/
4+
packages/python/plotly/plotly/tests/test_orca/images/linux/failed/
5+
16
*.egg-info
27

38
*.pyc
@@ -6,6 +11,8 @@
611

712
*~
813

14+
doc/python/raw.githubusercontent.com/
15+
916
# Don't ignore dataset files
1017
!*.csv.gz
1118

@@ -38,6 +45,9 @@ build
3845
dist
3946
plotly.egg-info/
4047

48+
# macOS utility file
49+
**/.DS_Store
50+
4151
plotly/tests/test_orca/images/*/failed
4252
plotly/tests/test_orca/images/*/tmp
4353
/plotly-package/plotly/tests/test_core/test_offline/plotly.min.js
@@ -52,3 +62,7 @@ doc/check-or-enforce-order.py
5262
packages/javascript/jupyterlab-plotly/lib/
5363
packages/python/plotly/jupyterlab_plotly/labextension/
5464
packages/python/plotly/jupyterlab_plotly/nbextension/index.js*
65+
packages/python/plotly/plotly/package_data/widgetbundle.js
66+
67+
test/percy/*.html
68+
test/percy/pandas2/*.html

Diff for: CHANGELOG.md

+270-2
Large diffs are not rendered by default.

Diff for: LICENSE.txt

+2-2
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

Diff for: README.md

+17-68
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@
3131
</tr>
3232
</table>
3333

34-
## Quickstart
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>
3539

36-
`pip install plotly==5.9.0`
40+
## Quickstart
3741

38-
Inside [Jupyter](https://jupyter.org/install) (installable with `pip install "jupyterlab>=3" "ipywidgets>=7.6"`):
42+
`pip install plotly==6.0.0rc0`
3943

4044
```python
4145
import plotly.express as px
@@ -45,7 +49,6 @@ fig.show()
4549

4650
See the [Python documentation](https://plotly.com/python/) for more examples.
4751

48-
4952
## Overview
5053

5154
[plotly.py](https://plotly.com/python/) is an interactive, open-source, and browser-based graphing library for Python :sparkles:
@@ -67,63 +70,37 @@ Built on top of [plotly.js](https://github.com/plotly/plotly.js), `plotly.py` is
6770
- [Contributing to plotly](https://github.com/plotly/plotly.py/blob/master/contributing.md)
6871
- [Changelog](https://github.com/plotly/plotly.py/blob/master/CHANGELOG.md)
6972
- [Code of Conduct](https://github.com/plotly/plotly.py/blob/master/CODE_OF_CONDUCT.md)
70-
- [Version 4 Migration Guide](https://plotly.com/python/v4-migration/)
71-
- [New! Announcing Dash 1.0](https://medium.com/plotly/welcoming-dash-1-0-0-f3af4b84bae)
7273
- [Community forum](https://community.plotly.com)
7374

7475
---
7576

7677
## Installation
7778

78-
plotly.py may be installed using pip...
79+
plotly.py may be installed using pip
7980

8081
```
81-
pip install plotly==5.9.0
82+
pip install plotly==6.0.0rc0
8283
```
8384

8485
or conda.
8586

8687
```
87-
conda install -c plotly plotly=5.9.0
88-
```
89-
90-
### JupyterLab Support
91-
92-
For use in [JupyterLab](https://jupyterlab.readthedocs.io/en/stable/), install the `jupyterlab` and `ipywidgets`
93-
packages using `pip`:
94-
95-
```
96-
pip install "jupyterlab>=3" "ipywidgets>=7.6"
88+
conda install -c plotly plotly=6.0.0rc0
9789
```
9890

99-
or `conda`:
100-
101-
```
102-
conda install "jupyterlab>=3" "ipywidgets>=7.6"
103-
```
104-
105-
The instructions above apply to JupyterLab 3.x. **For JupyterLab 2 or earlier**, run the following commands to install the required JupyterLab extensions (note that this will require [`node`](https://nodejs.org/) to be installed):
106-
107-
```
108-
# JupyterLab 2.x renderer support
109-
jupyter labextension install [email protected] @jupyter-widgets/jupyterlab-manager
110-
```
111-
112-
Please check out our [Troubleshooting guide](https://plotly.com/python/troubleshooting/) if you run into any problems with JupyterLab.
113-
114-
### Jupyter Notebook Support
91+
### Jupyter Widget Support
11592

116-
For use in the Jupyter Notebook, install the `notebook` and `ipywidgets`
93+
For use as a Jupyter widget, install `jupyter` and `anywidget`
11794
packages using `pip`:
11895

11996
```
120-
pip install "notebook>=5.3" "ipywidgets>=7.5"
97+
pip install jupyter anywidget
12198
```
12299

123100
or `conda`:
124101

125102
```
126-
conda install "notebook>=5.3" "ipywidgets>=7.5"
103+
conda install jupyter anywidget
127104
```
128105

129106
### Static Image Export
@@ -136,41 +113,18 @@ command line utility (legacy as of `plotly` version 4.9).
136113
#### Kaleido
137114

138115
The [`kaleido`](https://github.com/plotly/Kaleido) package has no dependencies and can be installed
139-
using pip...
116+
using pip
140117

141118
```
142119
pip install -U kaleido
143120
```
144121

145-
or conda.
122+
or conda
146123

147124
```
148125
conda install -c conda-forge python-kaleido
149126
```
150127

151-
#### Orca
152-
153-
While Kaleido is now the recommended image export approach because it is easier to install
154-
and more widely compatible, [static image export](https://plotly.com/python/static-image-export/)
155-
can also be supported
156-
by the legacy [orca](https://github.com/plotly/orca) command line utility and the
157-
[`psutil`](https://github.com/giampaolo/psutil) Python package.
158-
159-
These dependencies can both be installed using conda:
160-
161-
```
162-
conda install -c plotly plotly-orca==1.3.1 psutil
163-
```
164-
165-
Or, `psutil` can be installed using pip...
166-
167-
```
168-
pip install psutil
169-
```
170-
171-
and orca can be installed according to the instructions in the [orca README](https://github.com/plotly/orca).
172-
173-
174128
### Extended Geo Support
175129

176130
Some plotly.py features rely on fairly large geographic shape files. The county
@@ -187,16 +141,11 @@ or conda
187141
conda install -c plotly plotly-geo=1.0.0
188142
```
189143

190-
## Migration
191-
192-
If you're migrating from plotly.py v3 to v4, please check out the [Version 4 migration guide](https://plotly.com/python/v4-migration/)
193-
194-
If you're migrating from plotly.py v2 to v3, please check out the [Version 3 migration guide](https://github.com/plotly/plotly.py/blob/master/migration-guide.md)
195-
196144
## Copyright and Licenses
197145

198146
Code and documentation copyright 2019 Plotly, Inc.
199147

200148
Code released under the [MIT license](https://github.com/plotly/plotly.py/blob/master/LICENSE.txt).
201149

202150
Docs released under the [Creative Commons license](https://github.com/plotly/documentation/blob/source/LICENSE).
151+

Diff for: SECURITY.md

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
| Version | Supported |
6+
| ------- | ------------------ |
7+
| 5.x | :white_check_mark: |
8+
| < 5.0 | :x: |
9+
10+
## Reporting a Vulnerability
11+
12+
Please email [email protected] with any concerns about security.

Diff for: binder/requirements.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
jupytext
2-
plotly==5.9.0
2+
plotly==5.24.1
33
jupyter
44
notebook
5-
pandas==1.0.3
6-
statsmodels==0.11.1
5+
pandas==2.2.2
6+
statsmodels==0.14.2
77
scipy
8-
patsy==0.5.1
8+
patsy==0.5.6
99
numpy
1010
plotly-geo
1111
psutil

0 commit comments

Comments
 (0)