Skip to content

Commit be3368d

Browse files
authored
Merge branch 'master' into cssloader_dev_dependencies
2 parents a753fc5 + d3220c8 commit be3368d

Some content is hidden

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

73 files changed

+963
-710
lines changed

.circleci/config.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 49 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,82 @@
1+
import os
2+
13
import requests
24

3-
dirOut = '.circleci/fonts/truetype/googleFonts/'
5+
dir_out = ".circleci/fonts/truetype/googleFonts/"
6+
47

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)
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)
1118
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}")
1223
raise RuntimeError(f"""
1324
Download failed.
1425
Status code: {req.status_code}
1526
Message: {req.reason}
16-
"""
17-
)
18-
open(dirOut + name, 'wb').write(req.content)
27+
""")
28+
open(out_file, "wb").write(req.content)
29+
1930

2031
download(
21-
'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSansMono/',
22-
'NotoSansMono',
23-
[
24-
'-Regular',
25-
'-Bold'
26-
]
32+
"https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansMono/hinted/ttf/",
33+
"NotoSansMono",
34+
["-Regular", "-Bold"],
2735
)
2836

2937
download(
30-
'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSans/',
31-
'NotoSans',
32-
[
33-
'-Regular',
34-
'-Italic',
35-
'-Bold'
36-
]
38+
"https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSans/hinted/ttf/",
39+
"NotoSans",
40+
["-Regular", "-Italic", "-Bold"],
3741
)
3842

3943
download(
40-
'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSerif/',
41-
'NotoSerif',
44+
"https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSerif/hinted/ttf/",
45+
"NotoSerif",
4246
[
43-
'-Regular',
44-
'-Italic',
45-
'-Bold',
46-
'-BoldItalic',
47-
]
47+
"-Regular",
48+
"-Italic",
49+
"-Bold",
50+
"-BoldItalic",
51+
],
4852
)
4953

5054
download(
51-
'https://github.com/google/fonts/blob/main/ofl/oldstandardtt/',
52-
'OldStandard',
53-
[
54-
'-Regular',
55-
'-Italic',
56-
'-Bold'
57-
]
55+
"https://raw.githubusercontent.com/google/fonts/refs/heads/main/ofl/oldstandardtt/",
56+
"OldStandard",
57+
["-Regular", "-Italic", "-Bold"],
5858
)
5959

6060
download(
61-
'https://github.com/google/fonts/blob/main/ofl/ptsansnarrow/',
62-
'PT_Sans-Narrow-Web',
63-
[
64-
'-Regular',
65-
'-Bold'
66-
]
61+
"https://raw.githubusercontent.com/google/fonts/refs/heads/main/ofl/ptsansnarrow/",
62+
"PT_Sans-Narrow-Web",
63+
["-Regular", "-Bold"],
6764
)
6865

6966
download(
70-
'https://github.com/impallari/Raleway/blob/master/fonts/v3.000%20Fontlab/TTF/',
71-
'Raleway',
72-
[
73-
'-Regular',
74-
'-Regular-Italic',
75-
'-Bold',
76-
'-Bold-Italic'
77-
]
67+
"https://raw.githubusercontent.com/impallari/Raleway/refs/heads/master/fonts/v3.000%20Fontlab/TTF/",
68+
"Raleway",
69+
["-Regular", "-Regular-Italic", "-Bold", "-Bold-Italic"],
7870
)
7971

8072
download(
81-
'https://github.com/googlefonts/roboto/blob/main/src/hinted/',
82-
'Roboto',
83-
[
84-
'-Regular',
85-
'-Italic',
86-
'-Bold',
87-
'-BoldItalic'
88-
]
73+
"https://raw.githubusercontent.com/googlefonts/roboto-2/refs/heads/main/src/hinted/",
74+
"Roboto",
75+
["-Regular", "-Italic", "-Bold", "-BoldItalic"],
8976
)
9077

9178
download(
92-
'https://github.com/expo/google-fonts/blob/main/font-packages/gravitas-one/400Regular/',
93-
'GravitasOne',
94-
[
95-
'_400Regular'
96-
]
79+
"https://raw.githubusercontent.com/expo/google-fonts/refs/heads/main/font-packages/gravitas-one/400Regular/",
80+
"GravitasOne",
81+
["_400Regular"],
9782
)

.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.

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

draftlogs/7269_add.md

Lines changed: 1 addition & 0 deletions

draftlogs/7381_fix.md

Lines changed: 1 addition & 0 deletions

draftlogs/7400_change.md

Lines changed: 1 addition & 0 deletions

lib/locales/cs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717
'Compare data on hover': 'Porovnat hodnoty při najetí myší', // components/modebar/buttons.js:167
1818
'Double-click on legend to isolate one trace': 'Dvojklikem na legendu izolujete jedinou datovou sadu', // components/legend/handle_click.js:90
1919
'Double-click to zoom back out': 'Dvojklikem vrátíte zvětšení', // plots/cartesian/dragbox.js:299
20-
'Download plot as a png': 'Uložit jako PNG', // components/modebar/buttons.js:52
20+
'Download plot as a PNG': 'Uložit jako PNG', // components/modebar/buttons.js:52
2121
'Download plot': 'Uložit', // components/modebar/buttons.js:53
2222
'Edit in Chart Studio': 'Editovat v Chart Studio', // components/modebar/buttons.js:76
2323
'IE only supports svg. Changing format to svg.': 'IE podporuje pouze SVG formát. Změněno na SVG.', // components/modebar/buttons.js:60

lib/locales/cy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = {
1818
'Double-click on legend to isolate one trace': 'Dwbl-gliciwch ar yr allwedd i neilltuo un llinell', // components / legend / handle_click.js: 89
1919
'Double-click to zoom back out': 'Dwbl-gliciwch i chwyddo\'n ôl', // plots / cartesian / dragbox.js: 1011
2020
'Download plot': 'Lawrlwythwch blot', // components / modebar / buttons.js: 55
21-
'Download plot as a png': 'Lawrlwythwch y plot fel png', // components / modebar / buttons.js: 54
21+
'Download plot as a PNG': 'Lawrlwythwch y plot fel PNG', // components / modebar / buttons.js: 54
2222
'Edit in Chart Studio': 'Golygu yn Chart Studio', // components / modebar / buttons.js: 87
2323
'IE only supports svg. Changing format to svg.': 'Dim ond svg mae IE yn ei gefnogi. Newid fformat i svg.', // components / modebar / buttons.js: 65
2424
'Lasso Select': 'Dewiswch â lasŵ', // components / modebar / buttons.js: 123

lib/locales/de.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = {
1616
'Compare data on hover': 'Über die Daten fahren, um sie zu vergleichen', // components/modebar/buttons.js:167
1717
'Double-click on legend to isolate one trace': 'Daten isolieren durch Doppelklick in der Legende', // components/legend/handle_click.js:90
1818
'Double-click to zoom back out': 'Herauszoomen durch Doppelklick', // plots/cartesian/dragbox.js:299
19-
'Download plot as a png': 'Graphen als PNG herunterladen', // components/modebar/buttons.js:52
19+
'Download plot as a PNG': 'Graphen als PNG herunterladen', // components/modebar/buttons.js:52
2020
'Download plot': 'Graphen herunterladen', // components/modebar/buttons.js:53
2121
'Edit in Chart Studio': 'Im Chart Studio bearbeiten', // components/modebar/buttons.js:76
2222
'IE only supports svg. Changing format to svg.': 'IE unterstützt nur SVG-Dateien. Format wird zu SVG gewechselt.', // components/modebar/buttons.js:60

lib/locales/es.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = {
1818
'Compare data on hover': 'Comparar datos al pasar por encima', // components/modebar/buttons.js:167
1919
'Double-click on legend to isolate one trace': 'Haga doble-clic en la leyenda para aislar una traza', // components/legend/handle_click.js:90
2020
'Double-click to zoom back out': 'Haga doble-clic para restaurar la escala', // plots/cartesian/dragbox.js:335
21-
'Download plot as a png': 'Descargar gráfica como png', // components/modebar/buttons.js:52
21+
'Download plot as a PNG': 'Descargar gráfica como PNG', // components/modebar/buttons.js:52
2222
'Download plot': 'Descargar gráfica', // components/modebar/buttons.js:53
2323
'Edit in Chart Studio': 'Editar en Chart Studio', // components/modebar/buttons.js:76
2424
'IE only supports svg. Changing format to svg.': 'IE solo soporta svg. Cambiando formato a svg.', // components/modebar/buttons.js:60

lib/locales/fi.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = {
1818
'Double-click on legend to isolate one trace': 'Kaksoisklikkaa selitettä eristääksesi yksi sarja',
1919
'Double-click to zoom back out': 'Kaksoisklikkaa zoomataksesi ulos',
2020
'Download plot': 'Lataa kuvio',
21-
'Download plot as a png': 'Lataa kuvio png-muodossa',
21+
'Download plot as a PNG': 'Lataa kuvio PNG-muodossa',
2222
'Edit in Chart Studio': 'Muokkaa Chart Studiossa',
2323
'IE only supports svg. Changing format to svg.': 'Formaatiksi vaihdetaan IE:n tukema svg.',
2424
'Lasso Select': 'Lassovalinta',

lib/locales/fr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = {
1818
'Compare data on hover': 'Comparaison entre données en survol',
1919
'Double-click on legend to isolate one trace': 'Double-cliquer sur la légende pour isoler une série',
2020
'Double-click to zoom back out': 'Double-cliquer pour dézoomer',
21-
'Download plot as a png': 'Télécharger le graphique en fichier PNG',
21+
'Download plot as a PNG': 'Télécharger le graphique en fichier PNG',
2222
'Download plot': 'Télécharger le graphique',
2323
'Edit in Chart Studio': 'Éditer le graphique sur Chart Studio',
2424
'IE only supports svg. Changing format to svg.': 'IE ne permet que les conversions en SVG. Conversion en SVG en cours.',

lib/locales/hr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717
'Compare data on hover': 'Usporedi podatke pri prijelazu mišem',
1818
'Double-click on legend to isolate one trace': 'Dvaput kliknite kako biste izolirali jednu oznaku',
1919
'Double-click to zoom back out': 'Dvaput kliknite kako biste vratili originalnu razinu zumiranja',
20-
'Download plot as a png': 'Preuzmite grafički prikaz kao .png',
20+
'Download plot as a PNG': 'Preuzmite grafički prikaz kao PNG',
2121
'Download plot': 'Preuzmite grafički prikaz',
2222
'Edit in Chart Studio': 'Uredite pomoću funkcionalnosti Chart Studio',
2323
'IE only supports svg. Changing format to svg.': 'IE podržava samo svg. Format se mijenja u svg.',

lib/locales/it.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717
'Compare data on hover': 'Compara i dati al passaggio del mouse', // components/modebar/buttons.js:167
1818
'Double-click on legend to isolate one trace': 'Doppio click per isolare i dati di una traccia', // components/legend/handle_click.js:90
1919
'Double-click to zoom back out': 'Doppio click per tornare allo zoom iniziale', // plots/cartesian/dragbox.js:299
20-
'Download plot as a png': 'Scarica il grafico come immagine png', // components/modebar/buttons.js:52
20+
'Download plot as a PNG': 'Scarica il grafico come immagine PNG', // components/modebar/buttons.js:52
2121
'Download plot': 'Scarica il grafico', // components/modebar/buttons.js:53
2222
'Edit in Chart Studio': 'Modifica in Chart Studio', // components/modebar/buttons.js:76
2323
'IE only supports svg. Changing format to svg.': 'IE supporta solo svg. Modifica formato in svg.', // components/modebar/buttons.js:60

lib/locales/ja.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = {
1616
'Compare data on hover': 'ホバー中のデータを比較', // components/modebar/buttons.js:167
1717
'Double-click on legend to isolate one trace': '凡例をダブルクリックして1つのトレースを無効化します', // components/legend/handle_click.js:90
1818
'Double-click to zoom back out': 'ダブルクリックでズームを戻します', // plots/cartesian/dragbox.js:299
19-
'Download plot as a png': 'PNGファイルでダウンロード', // components/modebar/buttons.js:52
19+
'Download plot as a PNG': 'PNGファイルでダウンロード', // components/modebar/buttons.js:52
2020
'Download plot': 'ダウンロード', // components/modebar/buttons.js:53
2121
'Edit in Chart Studio': 'Chart Studioで編集', // components/modebar/buttons.js:76
2222
'IE only supports svg. Changing format to svg.': 'IEはSVGのみサポートしています。SVGに変換します。', // components/modebar/buttons.js:60

lib/locales/ko.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717
'Compare data on hover': '마우스를 올리면 데이터와 비교합니다',
1818
'Double-click on legend to isolate one trace': '범례를 더블 클릭하여 하나의 트레이스를 분리합니다',
1919
'Double-click to zoom back out': '더블 클릭하여 줌을 해제합니다',
20-
'Download plot as a png': '.png 이미지 파일로 차트를 다운로드 합니다',
20+
'Download plot as a PNG': 'PNG 이미지 파일로 차트를 다운로드 합니다',
2121
'Download plot': '차트를 다운로드 합니다',
2222
'Edit in Chart Studio': 'Chart Studio를 수정합니다',
2323
'IE only supports svg. Changing format to svg.': 'IE는 svg만을 지원합니다. 포맷을 svg로 변경하세요',

lib/locales/nl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = {
1414
'Click to enter Y axis title': 'Klik om y-as titel in te vullen',
1515
'Click to enter radial axis title': 'Klik om radiaal-as titel in te vullen',
1616
'Double-click to zoom back out': 'Zoom uit door te dubbel klikken',
17-
'Download plot as a png': 'Dowload de plot als een png-bestand',
17+
'Download plot as a PNG': 'Dowload de plot als een PNG-bestand',
1818
'Download plot': 'Download de plot',
1919
'Draw circle': 'Teken cirkel',
2020
'Draw closed freeform': 'Teken gesloten vorm',

lib/locales/no.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module.exports = {
1818
'Double-click on legend to isolate one trace': 'Dobbelklikk på på forklaringen for å vise bare en serie', // components/legend/handle_click.js:89
1919
'Double-click to zoom back out': 'Dobbelklikk for å zoome ut igjen', // plots/cartesian/dragbox.js:1089
2020
'Download plot': 'Last ned plot', // components/modebar/buttons.js:53
21-
'Download plot as a png': 'Last ned plot som png', // components/modebar/buttons.js:52
21+
'Download plot as a PNG': 'Last ned plot som PNG', // components/modebar/buttons.js:52
2222
'Edit in Chart Studio': 'Editer i Chart Studio', // components/modebar/buttons.js:85
2323
'IE only supports svg. Changing format to svg.': 'IE støtter bare svg. Bytt format til svg.', // components/modebar/buttons.js:63
2424
'Lasso Select': 'Velg lasso', // components/modebar/buttons.js:121

lib/locales/pt-br.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717
'Compare data on hover': 'Comparar dados ao pairar',
1818
'Double-click on legend to isolate one trace': 'Duplo clique na legenda para isolar uma série',
1919
'Double-click to zoom back out': 'Duplo clique para reverter zoom',
20-
'Download plot as a png': 'Fazer download do gráfico como imagem (png)',
20+
'Download plot as a PNG': 'Fazer download do gráfico como imagem (PNG)',
2121
'Download plot': 'Fazer download do gráfico',
2222
'Edit in Chart Studio': 'Editar no Chart Studio',
2323
'IE only supports svg. Changing format to svg.': 'IE suporta apenas svg. Alterando formato para svg',

0 commit comments

Comments
 (0)