Merge remote-tracking branch 'origin/master' into cam/5192/add-min-max-scale-limits

Author: archmoj

.circleci/config.yml

@@ -44,7 +44,7 @@ jobs:
           install-firefox: false
           install-geckodriver: false
           install-chrome: true
-          chrome-version: "127.0.6533.119"
+          chrome-version: "132.0.6834.110"
       - attach_workspace:
           at: ~/
       - run:
@@ -83,7 +83,7 @@ jobs:
           install-firefox: false
           install-geckodriver: false
           install-chrome: true
-          chrome-version: "127.0.6533.119"
+          chrome-version: "132.0.6834.110"
       - attach_workspace:
           at: ~/
       - run:
@@ -105,7 +105,7 @@ jobs:
           install-firefox: false
           install-geckodriver: false
           install-chrome: true
-          chrome-version: "127.0.6533.119"
+          chrome-version: "132.0.6834.110"
       - attach_workspace:
           at: ~/
       - run:
@@ -127,7 +127,7 @@ jobs:
           install-firefox: false
           install-geckodriver: false
           install-chrome: true
-          chrome-version: "127.0.6533.119"
+          chrome-version: "132.0.6834.110"
       - attach_workspace:
           at: ~/
       - run:
@@ -168,7 +168,7 @@ jobs:
           install-firefox: false
           install-geckodriver: false
           install-chrome: true
-          chrome-version: "127.0.6533.119"
+          chrome-version: "132.0.6834.110"
       - attach_workspace:
           at: ~/
       - run:
@@ -189,7 +189,7 @@ jobs:
           install-firefox: false
           install-geckodriver: false
           install-chrome: true
-          chrome-version: "127.0.6533.119"
+          chrome-version: "132.0.6834.110"
       - attach_workspace:
           at: ~/
       - run:
@@ -217,11 +217,12 @@ jobs:
   make-baselines-virtual-webgl:
     parallelism: 8
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -235,11 +236,12 @@ jobs:
 
   make-baselines-mathjax3:
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -254,11 +256,12 @@ jobs:
   make-baselines:
     parallelism: 12
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -273,11 +276,12 @@ jobs:
   make-baselines-b64:
     parallelism: 12
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -347,11 +351,12 @@ jobs:
 
   make-exports:
     docker:
-      - image: circleci/python:3.8.9
+      - image: cimg/python:3.12.11
     working_directory: ~/plotly.js
     steps:
       - attach_workspace:
           at: ~/
+      - run: sudo apt-get update
       - run:
           name: Install kaleido, plotly.io and required fonts
           command: .circleci/env_image.sh
@@ -362,7 +367,7 @@ jobs:
             sudo apt-get install poppler-utils
       - run:
           name: Create svg, jpg, jpeg, webp, pdf and eps files
-          command: python3 test/image/make_exports.py
+          command: sudo python3 test/image/make_exports.py
       - persist_to_workspace:
           root: ~/
           paths:
@@ -407,7 +412,7 @@ jobs:
           name: Run syntax tests on source files
           command: .circleci/test.sh source-syntax
 
-  publish-dist:
+  publish-dist: &publish-dist
     docker:
       - image: cimg/node:18.20.4
     working_directory: ~/plotly.js
@@ -465,6 +470,11 @@ jobs:
           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")
           command: diff --unified --color dist/plot-schema.json test/plot-schema.json
 
+  publish-dist-node-v22:
+    <<: *publish-dist
+    docker:
+      - image: cimg/node:22.14.0
+
   test-stackgl-bundle:
     docker:
       - image: cimg/node:18.20.4
@@ -478,12 +488,33 @@ jobs:
           name: Bundle bundle-stackgl/index.js
           command: cd stackgl_modules && cp index.js INDEX.js && npm run bundle-stackgl
       - run:
-          name: Test stackgl_modules/index.js diff - If failed please remember this file in auto generated and you should not modify it directly until a dependeny change. To suggest changes please submit pull request to the relevant dependency.
+          name: Test stackgl_modules/index.js diff - If failed please remember this file in auto generated and you should not modify it directly until a dependency change. To suggest changes please submit pull request to the relevant dependency.
           command: diff --unified --color stackgl_modules/INDEX.js stackgl_modules/index.js
       - store_artifacts:
           path: stackgl_modules/index.js
           destination: stackgl_modules/index.js
 
+  test-topojson-build:
+    docker:
+      - image: cimg/node:18.20.4
+    working_directory: ~/plotly.js
+    steps:
+      - checkout
+      - run:
+          name: Set up build environment
+          command: cd topojson && npm ci
+      - run:
+          name: Build topojson
+          command: cd topojson && mv dist dist_backup && npm run build
+      - run:
+          name: Compare existing files with newly built files. Any difference is a failure. A failure might mean that the source data changed.
+          command: diff -qr topojson/dist topojson/dist_backup
+      - run:
+          name: Compress artifacts
+          command: tar -cvzf topojson.tar topojson/dist
+      - store_artifacts:
+          path: topojson.tar
+
 workflows:
   version: 2
   build-and-test:
@@ -552,4 +583,8 @@ workflows:
 
       - publish-dist
 
+      - publish-dist-node-v22
+
       - test-stackgl-bundle
+
+      - test-topojson-build

.circleci/download_google_fonts.py

@@ -1,90 +1,82 @@
+import os
+
 import requests
 
-dirOut = '.circleci/fonts/truetype/googleFonts/'
+dir_out = ".circleci/fonts/truetype/googleFonts/"
+
+
+def download(repo, family, types, overwrite=True):
+    for t in types:
+        name = family + t + ".ttf"
+        url = repo + name + "?raw=true"
+        out_file = dir_out + name
+        print("Getting: ", url)
+        if os.path.exists(out_file) and not overwrite:
+            print("    => Already exists: ", out_file)
+            continue
+        req = requests.get(url, allow_redirects=False)
+        if req.status_code != 200:
+            # If we get a redirect, print an error so that we know to update the URL
+            if req.status_code == 302 or req.status_code == 301:
+                new_url = req.headers.get("Location")
+                print(f"    => Redirected -- please update URL to: {new_url}")
+            raise RuntimeError(f"""
+Download failed.
+Status code: {req.status_code}
+Message: {req.reason}
+""")
+        open(out_file, "wb").write(req.content)
 
-def download(repo, family, types) :
-    for t in types :
-        name = family + t + '.ttf'
-        url = repo + name + '?raw=true'
-        print(url)
-        req = requests.get(url, allow_redirects=True)
-        open(dirOut + name, 'wb').write(req.content)
 
 download(
-    'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSansMono/',
-    'NotoSansMono',
-    [
-        '-Regular',
-        '-Bold'
-    ]
+    "https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSansMono/hinted/ttf/",
+    "NotoSansMono",
+    ["-Regular", "-Bold"],
 )
 
 download(
-    'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSans/',
-    'NotoSans',
-    [
-        '-Regular',
-        '-Italic',
-        '-Bold'
-    ]
+    "https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSans/hinted/ttf/",
+    "NotoSans",
+    ["-Regular", "-Italic", "-Bold"],
 )
 
 download(
-    'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSerif/',
-    'NotoSerif',
+    "https://cdn.jsdelivr.net/gh/notofonts/notofonts.github.io/fonts/NotoSerif/hinted/ttf/",
+    "NotoSerif",
     [
-        '-Regular',
-        '-Italic',
-        '-Bold',
-        '-BoldItalic',
-    ]
+        "-Regular",
+        "-Italic",
+        "-Bold",
+        "-BoldItalic",
+    ],
 )
 
 download(
-    'https://github.com/google/fonts/blob/main/ofl/oldstandardtt/',
-    'OldStandard',
-    [
-        '-Regular',
-        '-Italic',
-        '-Bold'
-    ]
+    "https://raw.githubusercontent.com/google/fonts/refs/heads/main/ofl/oldstandardtt/",
+    "OldStandard",
+    ["-Regular", "-Italic", "-Bold"],
 )
 
 download(
-    'https://github.com/google/fonts/blob/main/ofl/ptsansnarrow/',
-    'PT_Sans-Narrow-Web',
-    [
-        '-Regular',
-        '-Bold'
-    ]
+    "https://raw.githubusercontent.com/google/fonts/refs/heads/main/ofl/ptsansnarrow/",
+    "PT_Sans-Narrow-Web",
+    ["-Regular", "-Bold"],
 )
 
 download(
-    'https://github.com/impallari/Raleway/blob/master/fonts/v3.000%20Fontlab/TTF/',
-    'Raleway',
-    [
-        '-Regular',
-        '-Regular-Italic',
-        '-Bold',
-        '-Bold-Italic'
-    ]
+    "https://raw.githubusercontent.com/impallari/Raleway/refs/heads/master/fonts/v3.000%20Fontlab/TTF/",
+    "Raleway",
+    ["-Regular", "-Regular-Italic", "-Bold", "-Bold-Italic"],
 )
 
 download(
-    'https://github.com/googlefonts/roboto/blob/main/src/hinted/',
-    'Roboto',
-    [
-        '-Regular',
-        '-Italic',
-        '-Bold',
-        '-BoldItalic'
-    ]
+    "https://raw.githubusercontent.com/googlefonts/roboto-2/refs/heads/main/src/hinted/",
+    "Roboto",
+    ["-Regular", "-Italic", "-Bold", "-BoldItalic"],
 )
 
 download(
-    'https://github.com/expo/google-fonts/blob/master/font-packages/gravitas-one/',
-    'GravitasOne',
-    [
-        '_400Regular'
-    ]
+    "https://raw.githubusercontent.com/expo/google-fonts/refs/heads/main/font-packages/gravitas-one/400Regular/",
+    "GravitasOne",
+    ["_400Regular"],
 )

.circleci/env_image.sh

@@ -1,10 +1,21 @@
 #!/bin/sh
+set -e
 # install required fonts
-sudo apt-get install fonts-liberation2 fonts-open-sans fonts-noto-cjk fonts-noto-color-emoji && \
-sudo python3 .circleci/download_google_fonts.py && \
-sudo cp -r .circleci/fonts/ /usr/share/ && \
-sudo fc-cache -f && \
+sudo apt-get install fonts-liberation2 fonts-open-sans fonts-noto-cjk fonts-noto-color-emoji
+
+# install pip
+sudo curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+sudo python3 get-pip.py
+
+# install additional fonts
+sudo python3 -m pip install requests
+sudo python3 .circleci/download_google_fonts.py
+sudo cp -r .circleci/fonts/ /usr/share/
+sudo apt install fontconfig
+sudo fc-cache -f
+
 # install kaleido & plotly
-sudo python3 -m pip install kaleido==0.2.1 plotly==5.5.0 --progress-bar off
+sudo python3 -m pip install kaleido==0.2.1 plotly==6.2.0 --progress-bar off
+
 # install numpy i.e. to convert arrays to typed arrays
 sudo python3 -m pip install numpy==1.24.2