Skip to content

Commit 950ecd5

Browse files
committed
Merge remote-tracking branch 'origin/master' into fix-deprecated-tests
2 parents 3ec831c + e4eaf44 commit 950ecd5

File tree

200 files changed

+4427
-15142
lines changed

Some content is hidden

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

200 files changed

+4427
-15142
lines changed

.circleci/config.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 2.1
22
orbs:
3-
browser-tools: circleci/browser-tools@1.4.8
3+
browser-tools: circleci/browser-tools@1.5.1
44

55
# Inspired by:
66
# https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml
@@ -44,7 +44,7 @@ jobs:
4444
install-firefox: false
4545
install-geckodriver: false
4646
install-chrome: true
47-
chrome-version: "127.0.6533.119"
47+
chrome-version: "132.0.6834.110"
4848
- attach_workspace:
4949
at: ~/
5050
- run:
@@ -83,7 +83,7 @@ jobs:
8383
install-firefox: false
8484
install-geckodriver: false
8585
install-chrome: true
86-
chrome-version: "127.0.6533.119"
86+
chrome-version: "132.0.6834.110"
8787
- attach_workspace:
8888
at: ~/
8989
- run:
@@ -105,7 +105,7 @@ jobs:
105105
install-firefox: false
106106
install-geckodriver: false
107107
install-chrome: true
108-
chrome-version: "127.0.6533.119"
108+
chrome-version: "132.0.6834.110"
109109
- attach_workspace:
110110
at: ~/
111111
- run:
@@ -127,7 +127,7 @@ jobs:
127127
install-firefox: false
128128
install-geckodriver: false
129129
install-chrome: true
130-
chrome-version: "127.0.6533.119"
130+
chrome-version: "132.0.6834.110"
131131
- attach_workspace:
132132
at: ~/
133133
- run:
@@ -168,7 +168,7 @@ jobs:
168168
install-firefox: false
169169
install-geckodriver: false
170170
install-chrome: true
171-
chrome-version: "127.0.6533.119"
171+
chrome-version: "132.0.6834.110"
172172
- attach_workspace:
173173
at: ~/
174174
- run:
@@ -189,7 +189,7 @@ jobs:
189189
install-firefox: false
190190
install-geckodriver: false
191191
install-chrome: true
192-
chrome-version: "127.0.6533.119"
192+
chrome-version: "132.0.6834.110"
193193
- attach_workspace:
194194
at: ~/
195195
- run:
@@ -407,7 +407,7 @@ jobs:
407407
name: Run syntax tests on source files
408408
command: .circleci/test.sh source-syntax
409409

410-
publish-dist:
410+
publish-dist: &publish-dist
411411
docker:
412412
- image: cimg/node:18.20.4
413413
working_directory: ~/plotly.js
@@ -465,6 +465,11 @@ jobs:
465465
name: Test plot-schema.json diff - If failed, after (npm start) you could run (npm run schema && git add test/plot-schema.json && git commit -m "update plot-schema diff")
466466
command: diff --unified --color dist/plot-schema.json test/plot-schema.json
467467

468+
publish-dist-node-v22:
469+
<<: *publish-dist
470+
docker:
471+
- image: cimg/node:22.14.0
472+
468473
test-stackgl-bundle:
469474
docker:
470475
- image: cimg/node:18.20.4
@@ -552,4 +557,6 @@ workflows:
552557

553558
- publish-dist
554559

560+
- publish-dist-node-v22
561+
555562
- test-stackgl-bundle

.circleci/download_google_fonts.py

Lines changed: 54 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,82 @@
1+
import os
2+
13
import requests
24

3-
dirOut = '.circleci/fonts/truetype/googleFonts/'
5+
dir_out = ".circleci/fonts/truetype/googleFonts/"
6+
7+
8+
def download(repo, family, types, overwrite=True):
9+
for t in types:
10+
name = family + t + ".ttf"
11+
url = repo + name + "?raw=true"
12+
out_file = dir_out + name
13+
print("Getting: ", url)
14+
if os.path.exists(out_file) and not overwrite:
15+
print(" => Already exists: ", out_file)
16+
continue
17+
req = requests.get(url, allow_redirects=False)
18+
if req.status_code != 200:
19+
# If we get a redirect, print an error so that we know to update the URL
20+
if req.status_code == 302 or req.status_code == 301:
21+
new_url = req.headers.get("Location")
22+
print(f" => Redirected -- please update URL to: {new_url}")
23+
raise RuntimeError(f"""
24+
Download failed.
25+
Status code: {req.status_code}
26+
Message: {req.reason}
27+
""")
28+
open(out_file, "wb").write(req.content)
429

5-
def download(repo, family, types) :
6-
for t in types :
7-
name = family + t + '.ttf'
8-
url = repo + name + '?raw=true'
9-
print(url)
10-
req = requests.get(url, allow_redirects=True)
11-
open(dirOut + name, 'wb').write(req.content)
1230

1331
download(
14-
'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSansMono/',
15-
'NotoSansMono',
16-
[
17-
'-Regular',
18-
'-Bold'
19-
]
32+
"https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansMono/hinted/ttf/",
33+
"NotoSansMono",
34+
["-Regular", "-Bold"],
2035
)
2136

2237
download(
23-
'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSans/',
24-
'NotoSans',
25-
[
26-
'-Regular',
27-
'-Italic',
28-
'-Bold'
29-
]
38+
"https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSans/hinted/ttf/",
39+
"NotoSans",
40+
["-Regular", "-Italic", "-Bold"],
3041
)
3142

3243
download(
33-
'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSerif/',
34-
'NotoSerif',
44+
"https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSerif/hinted/ttf/",
45+
"NotoSerif",
3546
[
36-
'-Regular',
37-
'-Italic',
38-
'-Bold',
39-
'-BoldItalic',
40-
]
47+
"-Regular",
48+
"-Italic",
49+
"-Bold",
50+
"-BoldItalic",
51+
],
4152
)
4253

4354
download(
44-
'https://github.com/google/fonts/blob/main/ofl/oldstandardtt/',
45-
'OldStandard',
46-
[
47-
'-Regular',
48-
'-Italic',
49-
'-Bold'
50-
]
55+
"https://raw.githubusercontent.com/google/fonts/refs/heads/main/ofl/oldstandardtt/",
56+
"OldStandard",
57+
["-Regular", "-Italic", "-Bold"],
5158
)
5259

5360
download(
54-
'https://github.com/google/fonts/blob/main/ofl/ptsansnarrow/',
55-
'PT_Sans-Narrow-Web',
56-
[
57-
'-Regular',
58-
'-Bold'
59-
]
61+
"https://raw.githubusercontent.com/google/fonts/refs/heads/main/ofl/ptsansnarrow/",
62+
"PT_Sans-Narrow-Web",
63+
["-Regular", "-Bold"],
6064
)
6165

6266
download(
63-
'https://github.com/impallari/Raleway/blob/master/fonts/v3.000%20Fontlab/TTF/',
64-
'Raleway',
65-
[
66-
'-Regular',
67-
'-Regular-Italic',
68-
'-Bold',
69-
'-Bold-Italic'
70-
]
67+
"https://raw.githubusercontent.com/impallari/Raleway/refs/heads/master/fonts/v3.000%20Fontlab/TTF/",
68+
"Raleway",
69+
["-Regular", "-Regular-Italic", "-Bold", "-Bold-Italic"],
7170
)
7271

7372
download(
74-
'https://github.com/googlefonts/roboto/blob/main/src/hinted/',
75-
'Roboto',
76-
[
77-
'-Regular',
78-
'-Italic',
79-
'-Bold',
80-
'-BoldItalic'
81-
]
73+
"https://raw.githubusercontent.com/googlefonts/roboto-2/refs/heads/main/src/hinted/",
74+
"Roboto",
75+
["-Regular", "-Italic", "-Bold", "-BoldItalic"],
8276
)
8377

8478
download(
85-
'https://github.com/expo/google-fonts/blob/master/font-packages/gravitas-one/',
86-
'GravitasOne',
87-
[
88-
'_400Regular'
89-
]
79+
"https://raw.githubusercontent.com/expo/google-fonts/refs/heads/main/font-packages/gravitas-one/400Regular/",
80+
"GravitasOne",
81+
["_400Regular"],
9082
)

.circleci/env_image.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
#!/bin/sh
2+
set -e
23
# install required fonts
3-
sudo apt-get install fonts-liberation2 fonts-open-sans fonts-noto-cjk fonts-noto-color-emoji && \
4-
sudo python3 .circleci/download_google_fonts.py && \
5-
sudo cp -r .circleci/fonts/ /usr/share/ && \
6-
sudo fc-cache -f && \
4+
sudo apt-get install fonts-liberation2 fonts-open-sans fonts-noto-cjk fonts-noto-color-emoji
5+
sudo python3 .circleci/download_google_fonts.py
6+
sudo cp -r .circleci/fonts/ /usr/share/
7+
sudo fc-cache -f
78
# install kaleido & plotly
89
sudo python3 -m pip install kaleido==0.2.1 plotly==5.5.0 --progress-bar off
910
# install numpy i.e. to convert arrays to typed arrays

.circleci/fonts/truetype/googleFonts/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

CHANGELOG.md

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,20 @@ To see all merged commits on the master branch that will be part of the next plo
99

1010
where X.Y.Z is the semver of most recent plotly.js release.
1111

12-
## [3.0.0-rc.2] -- 2024-12-16
12+
## [3.0.1] -- 2025-02-18
13+
14+
### Changed
15+
- Update `color-rgba` from 2.1.1 to 3.0.0 to fix hsl color conversion bug [[#7325](https://github.com/plotly/plotly.js/pull/7325)]
16+
17+
### Fixed
18+
- Fix click event handling for plots in shadow DOM elements [[#7357](https://github.com/plotly/plotly.js/pull/7357)]
19+
- Fix hoverlabels and other text labels with null values templated in [[#7360](https://github.com/plotly/plotly.js/pull/7360)]
20+
- Fix importing plotly.js via require on pages with [AMD](https://en.wikipedia.org/wiki/Asynchronous_module_definition) [[#7367](https://github.com/plotly/plotly.js/pull/7367)]
21+
- Update Romanian locale [[#7351](https://github.com/plotly/plotly.js/pull/7351)]
22+
- Update Italian locale [[#4425](https://github.com/plotly/plotly.js/pull/4425)]
23+
- Update Turkish locale [[#7352](https://github.com/plotly/plotly.js/pull/7352)]
24+
25+
## [3.0.0] -- 2025-01-27
1326

1427
### Removed
1528
- Drop support for passing a string to the `title` attribute, and drop support for deprecated attributes `titlefont`, `titleposition`, `titleside`, and `titleoffset` (use `title.text`, `title.font`, `title.side`, `title.offset` instead)[[#7212](https://github.com/plotly/plotly.js/pull/7212)]
@@ -639,7 +652,7 @@ Drop support for deprecated `bardir` attribute (use `orientation` instead) [[#72
639652
## [2.15.1] -- 2022-10-11
640653

641654
### Fixed
642-
- Fix latest version of plotly.js main module on npm
655+
- Fix latest version of plotly.js main module on npm
643656

644657

645658
## [2.15.0] -- 2022-10-06
@@ -658,9 +671,9 @@ Drop support for deprecated `bardir` attribute (use `orientation` instead) [[#72
658671
- Fix automargin to update axis titles in redraws [[#6312](https://github.com/plotly/plotly.js/pull/6312)]
659672
- Fix exporting patterns with transparent color [[#6318](https://github.com/plotly/plotly.js/pull/6318)]
660673
- Fix exporting text on empty slices [[#6335](https://github.com/plotly/plotly.js/pull/6335)]
661-
- Disable interactions for `treemap`, `icicle`, `sunburst`, `pie`, `funnelarea`,
674+
- Disable interactions for `treemap`, `icicle`, `sunburst`, `pie`, `funnelarea`,
662675
`parcats`, `parcoords` and `sankey` traces when `staticPlot` is set to true [[#6296](https://github.com/plotly/plotly.js/pull/6296)]
663-
676+
664677

665678
## [2.14.0] -- 2022-08-10
666679

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ authors:
99
- family-names: "Samimi"
1010
given-names: "Mojtaba"
1111
title: "Open source Plotly charting library"
12-
version: 3.0.0-rc.2
12+
version: 3.0.1
1313
doi: 10.5281/zenodo.13964707
14-
date-released: 2024-09-10
14+
date-released: 2025-01-27
1515
url: "https://github.com/plotly/plotly.js"

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
6262
6363
```html
6464
<head>
65-
<script src="https://cdn.plot.ly/plotly-3.0.0-rc.2.min.js" charset="utf-8"></script>
65+
<script src="https://cdn.plot.ly/plotly-3.0.1.min.js" charset="utf-8"></script>
6666
</head>
6767
<body>
6868
<div id="gd"></div>
@@ -79,7 +79,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
7979
Alternatively you may consider using [native ES6 import](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules) in the script tag.
8080
```html
8181
<script type="module">
82-
import "https://cdn.plot.ly/plotly-3.0.0-rc.2.min.js"
82+
import "https://cdn.plot.ly/plotly-3.0.1.min.js"
8383
Plotly.newPlot("gd", [{ y: [1, 2, 3] }])
8484
</script>
8585
```
@@ -89,7 +89,7 @@ Fastly supports Plotly.js with free CDN service. Read more at <https://www.fastl
8989
### Un-minified versions are also available on CDN
9090
While non-minified source files may contain characters outside UTF-8, it is recommended that you specify the `charset` when loading those bundles.
9191
```html
92-
<script src="https://cdn.plot.ly/plotly-3.0.0-rc.2.js" charset="utf-8"></script>
92+
<script src="https://cdn.plot.ly/plotly-3.0.1.js" charset="utf-8"></script>
9393
```
9494

9595
> Please note that as of v2 the "plotly-latest" outputs (e.g. https://cdn.plot.ly/plotly-latest.min.js) will no longer be updated on the CDN, and will stay at the last v1 patch v1.58.5. Therefore, to use the CDN with plotly.js v2 and higher, you must specify an exact plotly.js version.

devtools/test_dashboard/devtools.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ var Tabs = {
7777
};
7878
},
7979

80-
// Save a png snapshot and display it below the plot
80+
// Save a PNG snapshot and display it below the plot
8181
snapshot: function(id) {
8282
var gd = Tabs.getGraph(id);
8383

devtools/test_dashboard/index-mathjax3.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h4>no MathJax: Apple: $2, Orange: $3</h4>
3737
}
3838
};
3939
</script>
40-
<script src="../../node_modules/mathjax-v3/es5/tex-svg.js"></script>
40+
<script src="../../node_modules/@plotly/mathjax-v3/es5/tex-svg.js"></script>
4141
<script charset="utf-8" id="source" src="../../build/plotly.js" type="module"></script>
4242
<script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>
4343
</body>

devtools/test_dashboard/index-mathjax3chtml.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
}
6161
};
6262
</script>
63-
<script src="../../node_modules/mathjax-v3/es5/tex-chtml.js"></script>
63+
<script src="../../node_modules/@plotly/mathjax-v3/es5/tex-chtml.js"></script>
6464

6565
<script charset="utf-8" id="source" src="../../build/plotly.js" type="module"></script>
6666
<script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>

devtools/test_dashboard/index-strict.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</div>
2323
<div id="snapshot"></div>
2424

25-
<script src="../../node_modules/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
25+
<script src="../../node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
2626
<script charset="utf-8" id="source" src="../../build/plotly.js"></script>
2727
<script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>
2828
</body>

devtools/test_dashboard/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</div>
2222
<div id="snapshot"></div>
2323

24-
<script src="../../node_modules/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
24+
<script src="../../node_modules/@plotly/mathjax-v2/MathJax.js?config=TeX-AMS-MML_SVG"></script>
2525
<script charset="utf-8" id="source" src="../../build/plotly.js"></script>
2626
<script charset="utf-8" src="../../build/test_dashboard-bundle.js"></script>
2727
</body>

0 commit comments

Comments
 (0)