Skip to content
/ plotly.js Public

Commit 2dd29b4

Browse files
archmojarchmoj
committedAug 20, 2024·
Merge remote-tracking branch 'origin/master' into voronoi
 - resolved conflicts in: package-lock.json package.json
2 parents 14f540a + 3eccac0 commit 2dd29b4

File tree

1,738 files changed

+1558044
-1595559
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,738 files changed

+1558044
-1595559
lines changed
 

Diff for: ‎.circleci/config.yml

+24-92
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,9 @@ orbs:
1010
# https://hub.docker.com/r/cimg/node/tags/
1111

1212
jobs:
13-
install-and-cibuild-node12: # cibuild using node 12 & npm 6
13+
install-and-cibuild:
1414
docker:
15-
- image: cimg/node:12.22.7
16-
working_directory: ~/plotly.js
17-
steps:
18-
- checkout
19-
- run:
20-
name: Set up build environment
21-
command: .circleci/env_build.sh
22-
- run:
23-
name: Pretest
24-
command: npm run pretest
25-
- run:
26-
name: CI-Build
27-
command: npm run cibuild
28-
29-
install-and-cibuild: # main cibuild using node 16 & npm 7
30-
docker:
31-
- image: cimg/node:16.17.1
15+
- image: cimg/node:18.20.4
3216
working_directory: ~/plotly.js
3317
steps:
3418
- checkout
@@ -52,7 +36,7 @@ jobs:
5236
timezone-jasmine:
5337
docker:
5438
# need '-browsers' version to test in real (xvfb-wrapped) browsers
55-
- image: cimg/node:16.17.1-browsers
39+
- image: cimg/node:18.20.4-browsers
5640
working_directory: ~/plotly.js
5741
steps:
5842
- browser-tools/install-browser-tools: &browser-versions
@@ -84,7 +68,7 @@ jobs:
8468
no-gl-jasmine:
8569
docker:
8670
# need '-browsers' version to test in real (xvfb-wrapped) browsers
87-
- image: cimg/node:16.17.1-browsers
71+
- image: cimg/node:18.20.4-browsers
8872
environment:
8973
# Alaska time (arbitrary timezone to test date logic)
9074
TZ: "America/Anchorage"
@@ -103,7 +87,7 @@ jobs:
10387
webgl-jasmine:
10488
docker:
10589
# need '-browsers' version to test in real (xvfb-wrapped) browsers
106-
- image: cimg/node:16.17.1-browsers
90+
- image: cimg/node:18.20.4-browsers
10791
environment:
10892
# Alaska time (arbitrary timezone to test date logic)
10993
TZ: "America/Anchorage"
@@ -122,7 +106,7 @@ jobs:
122106
virtual-webgl-jasmine:
123107
docker:
124108
# need '-browsers' version to test in real (xvfb-wrapped) browsers
125-
- image: cimg/node:16.17.1-browsers
109+
- image: cimg/node:18.20.4-browsers
126110
environment:
127111
# Alaska time (arbitrary timezone to test date logic)
128112
TZ: "America/Anchorage"
@@ -141,7 +125,7 @@ jobs:
141125
flaky-no-gl-jasmine:
142126
docker:
143127
# need '-browsers' version to test in real (xvfb-wrapped) browsers
144-
- image: cimg/node:16.17.1-browsers
128+
- image: cimg/node:18.20.4-browsers
145129
environment:
146130
# Alaska time (arbitrary timezone to test date logic)
147131
TZ: "America/Anchorage"
@@ -159,7 +143,7 @@ jobs:
159143
bundle-jasmine:
160144
docker:
161145
# need '-browsers' version to test in real (xvfb-wrapped) browsers
162-
- image: cimg/node:16.17.1-browsers
146+
- image: cimg/node:18.20.4-browsers
163147
environment:
164148
# Alaska time (arbitrary timezone to test date logic)
165149
TZ: "America/Anchorage"
@@ -174,48 +158,10 @@ jobs:
174158
name: Run jasmine tests (part D)
175159
command: .circleci/test.sh bundle-jasmine
176160

177-
mathjax-firefox81:
178-
docker:
179-
# need '-browsers' version to test in real (xvfb-wrapped) browsers
180-
- image: cimg/node:16.17.1-browsers
181-
environment:
182-
# Alaska time (arbitrary timezone to test date logic)
183-
TZ: "America/Anchorage"
184-
working_directory: ~/plotly.js
185-
steps:
186-
- browser-tools/install-browser-tools: &browser-versions
187-
firefox-version: '81.0'
188-
install-chrome: false
189-
install-chromedriver: false
190-
- attach_workspace:
191-
at: ~/
192-
- run:
193-
name: Test MathJax on firefox-81
194-
command: .circleci/test.sh mathjax-firefox
195-
196-
mathjax-firefox82:
197-
docker:
198-
# need '-browsers' version to test in real (xvfb-wrapped) browsers
199-
- image: cimg/node:16.17.1-browsers
200-
environment:
201-
# Alaska time (arbitrary timezone to test date logic)
202-
TZ: "America/Anchorage"
203-
working_directory: ~/plotly.js
204-
steps:
205-
- browser-tools/install-browser-tools: &browser-versions
206-
firefox-version: '82.0'
207-
install-chrome: false
208-
install-chromedriver: false
209-
- attach_workspace:
210-
at: ~/
211-
- run:
212-
name: Test MathJax on firefox-82
213-
command: .circleci/test.sh mathjax-firefox82+
214-
215161
mathjax-firefoxLatest:
216162
docker:
217163
# need '-browsers' version to test in real (xvfb-wrapped) browsers
218-
- image: cimg/node:16.17.1-browsers
164+
- image: cimg/node:18.20.4-browsers
219165
environment:
220166
# Alaska time (arbitrary timezone to test date logic)
221167
TZ: "America/Anchorage"
@@ -228,10 +174,10 @@ jobs:
228174
at: ~/
229175
- run:
230176
name: Test MathJax on firefox-latest
231-
command: .circleci/test.sh mathjax-firefox82+
177+
command: .circleci/test.sh mathjax-firefox
232178

233179
make-baselines-virtual-webgl:
234-
parallelism: 4
180+
parallelism: 8
235181
docker:
236182
- image: circleci/python:3.8.9
237183
working_directory: ~/plotly.js
@@ -268,7 +214,7 @@ jobs:
268214
- plotly.js
269215

270216
make-baselines:
271-
parallelism: 4
217+
parallelism: 12
272218
docker:
273219
- image: circleci/python:3.8.9
274220
working_directory: ~/plotly.js
@@ -287,7 +233,7 @@ jobs:
287233
- plotly.js
288234

289235
make-baselines-b64:
290-
parallelism: 4
236+
parallelism: 12
291237
docker:
292238
- image: circleci/python:3.8.9
293239
working_directory: ~/plotly.js
@@ -307,7 +253,7 @@ jobs:
307253

308254
test-baselines:
309255
docker:
310-
- image: circleci/node:16.9.0
256+
- image: cimg/node:18.20.4
311257
working_directory: ~/plotly.js
312258
steps:
313259
- attach_workspace:
@@ -321,7 +267,7 @@ jobs:
321267

322268
test-baselines-virtual-webgl:
323269
docker:
324-
- image: circleci/node:16.9.0
270+
- image: cimg/node:18.20.4
325271
working_directory: ~/plotly.js
326272
steps:
327273
- attach_workspace:
@@ -335,7 +281,7 @@ jobs:
335281

336282
test-baselines-b64:
337283
docker:
338-
- image: circleci/node:16.9.0
284+
- image: cimg/node:18.20.4
339285
working_directory: ~/plotly.js
340286
steps:
341287
- attach_workspace:
@@ -349,7 +295,7 @@ jobs:
349295

350296
test-baselines-mathjax3:
351297
docker:
352-
- image: circleci/node:16.9.0
298+
- image: cimg/node:18.20.4
353299
working_directory: ~/plotly.js
354300
steps:
355301
- attach_workspace:
@@ -374,8 +320,8 @@ jobs:
374320
- run:
375321
name: Install poppler-utils to have pdftops for exporting eps
376322
command: |
377-
sudo apt-get update --allow-releaseinfo-change
378-
sudo apt-get install poppler-utils
323+
sudo apt-get update --allow-releaseinfo-change
324+
sudo apt-get install poppler-utils
379325
- run:
380326
name: Create svg, jpg, jpeg, webp, pdf and eps files
381327
command: python3 test/image/make_exports.py
@@ -386,7 +332,7 @@ jobs:
386332

387333
test-exports:
388334
docker:
389-
- image: circleci/node:16.9.0
335+
- image: cimg/node:18.20.4
390336
working_directory: ~/plotly.js
391337
steps:
392338
- attach_workspace:
@@ -400,7 +346,7 @@ jobs:
400346

401347
mock-validation:
402348
docker:
403-
- image: cimg/node:16.17.1
349+
- image: cimg/node:18.20.4
404350
working_directory: ~/plotly.js
405351
steps:
406352
- attach_workspace:
@@ -414,7 +360,7 @@ jobs:
414360

415361
source-syntax:
416362
docker:
417-
- image: cimg/node:16.17.1
363+
- image: cimg/node:18.20.4
418364
working_directory: ~/plotly.js
419365
steps:
420366
- attach_workspace:
@@ -425,7 +371,7 @@ jobs:
425371

426372
publish-dist:
427373
docker:
428-
- image: cimg/node:16.17.1
374+
- image: cimg/node:18.20.4
429375
working_directory: ~/plotly.js
430376
steps:
431377
- checkout
@@ -486,16 +432,10 @@ jobs:
486432
- run:
487433
name: Test plotly.min.js import using requirejs
488434
command: npm run test-requirejs
489-
- run:
490-
name: Test plotly bundles against es6
491-
command: npm run no-es6-dist
492-
- run:
493-
name: Display function constructors in all bundles
494-
command: npm run no-new-func
495435

496436
test-stackgl-bundle:
497437
docker:
498-
- image: cimg/node:16.17.1
438+
- image: cimg/node:18.20.4
499439
working_directory: ~/plotly.js
500440
steps:
501441
- checkout
@@ -516,21 +456,13 @@ workflows:
516456
version: 2
517457
build-and-test:
518458
jobs:
519-
- install-and-cibuild-node12
520-
521459
- install-and-cibuild
522460
- timezone-jasmine:
523461
requires:
524462
- install-and-cibuild
525463
- bundle-jasmine:
526464
requires:
527465
- install-and-cibuild
528-
- mathjax-firefox81:
529-
requires:
530-
- install-and-cibuild
531-
- mathjax-firefox82:
532-
requires:
533-
- install-and-cibuild
534466
- mathjax-firefoxLatest:
535467
requires:
536468
- install-and-cibuild

Diff for: ‎.circleci/test.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ case $1 in
8484
exit $EXIT_STATE
8585
;;
8686

87-
mathjax-firefox82+)
88-
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --skip-tags=noFF82 --nowatch &&
89-
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --skip-tags=noFF82 --nowatch &&
87+
mathjax-firefox)
88+
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --nowatch &&
89+
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --nowatch &&
9090
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --mathjax3 --nowatch &&
9191
./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --nowatch || EXIT_STATE=$?
9292
exit $EXIT_STATE
@@ -95,14 +95,14 @@ case $1 in
9595
make-baselines-virtual-webgl)
9696
SUITE=$({\
9797
find $ROOT/test/image/mocks/gl* -type f -printf "%f\n"; \
98-
find $ROOT/test/image/mocks/mapbox* -type f -printf "%f\n"; \
98+
find $ROOT/test/image/mocks/map* -type f -printf "%f\n"; \
9999
} | sed 's/\.json$//1' | circleci tests split)
100100
python3 test/image/make_baseline.py virtual-webgl $SUITE || EXIT_STATE=$?
101101
exit $EXIT_STATE
102102
;;
103103

104104
make-baselines-mathjax3)
105-
python3 test/image/make_baseline.py mathjax3 legend_mathjax_title_and_items mathjax parcats_grid_subplots table_latex_multitrace_scatter table_plain_birds table_wrapped_birds ternary-mathjax || EXIT_STATE=$?
105+
python3 test/image/make_baseline.py mathjax3 legend_mathjax_title_and_items mathjax parcats_grid_subplots table_latex_multitrace_scatter table_plain_birds table_wrapped_birds ternary-mathjax ternary-mathjax-title-place-subtitle || EXIT_STATE=$?
106106
exit $EXIT_STATE
107107
;;
108108

0 commit comments

Comments
 (0)