Merge branch 'plotly:master' into patch-2

Author: rl-utility-man

.circleci/config.yml

@@ -46,6 +46,9 @@ commands:
             . venv/bin/activate
             pip install --upgrade pip wheel
             pip install -r ./test_requirements/requirements_<<parameters.py>>_optional.txt
+            cd js
+            npm ci
+            npm run build
       - run:
           name: Install plotly-geo
           command: |
@@ -249,13 +252,13 @@ jobs:
       - test_optional:
           py: "312_no_numpy"
 
-  # Orca
-  python_38_orca:
+  python_312_np2:
     docker:
-      - image: cimg/python:3.8-browsers
+      - image: cimg/python:3.12-browsers
     steps:
-      - test_orca:
-          py: "38"
+      - test_optional:
+          py: "312_np2"
+
 
   # Percy
   python_39_percy:
@@ -347,9 +350,9 @@ jobs:
             . venv/bin/activate
             pip install --upgrade pip wheel
             pip install -r ./test_requirements/requirements_38_core.txt black inflect
-            pip install jupyterlab~=3.0
+            pip install jupyterlab
       - run:
-          name: Update jupyterlab-plotly version
+          name: Update jupyter widget plotly.js version
           command: |
             cd packages/python/plotly
             . venv/bin/activate
@@ -403,7 +406,7 @@ jobs:
             conda config --remove channels defaults
             conda config --add channels conda-forge
             conda create -n env --yes python=3.9 conda-build=3.28.4 conda-verify
-            conda install -n env -c conda-forge jupyterlab=3 nodejs=16
+            conda install -n env -c conda-forge jupyterlab nodejs=16
             conda init bash
             mkdir output
 
@@ -412,9 +415,9 @@ jobs:
           command: |
             eval "$(conda shell.bash hook)"
             conda activate env
-            cd packages/javascript/jupyterlab-plotly
+            cd packages/python/plotly/js
             npm ci
-            npm run build:prod
+            npm run build
             git status
 
       - run:
@@ -438,13 +441,13 @@ jobs:
             git status
 
       - run:
-          name: NPM Pack
+          name: Build Widget javascript bundle
           command: |
             eval "$(conda shell.bash hook)"
             conda activate env
-            cd packages/javascript/jupyterlab-plotly
-            npm pack
-            mv jupyterlab-plotly*.tgz ../../../output
+            cd packages/python/plotly/js
+            npm ci
+            npm run build
 
       - run:
           name: Zip output
@@ -491,7 +494,12 @@ jobs:
             pip install -r requirements.txt
             if [ "${CIRCLE_BRANCH}" != "doc-prod" ]; then
               pip uninstall -y plotly
-              pip install -e ../packages/python/plotly
+              cd ../packages/python/plotly
+              pip install -e .
+              cd js
+              npm ci
+              npm run build
+              cd ../../../../doc
             fi
             cd ..
       - run:
@@ -613,7 +621,7 @@ workflows:
       - python_311_optional
       - python_312_optional
       - python_39_pandas_2_optional
-      - python_38_orca
       - python_39_percy
       - python_312_no_numpy
+      - python_312_np2
       - build-doc

.gitignore

@@ -45,6 +45,9 @@ build
 dist
 plotly.egg-info/
 
+# macOS utility file
+**/.DS_Store
+
 plotly/tests/test_orca/images/*/failed
 plotly/tests/test_orca/images/*/tmp
 /plotly-package/plotly/tests/test_core/test_offline/plotly.min.js
@@ -59,6 +62,7 @@ doc/check-or-enforce-order.py
 packages/javascript/jupyterlab-plotly/lib/
 packages/python/plotly/jupyterlab_plotly/labextension/
 packages/python/plotly/jupyterlab_plotly/nbextension/index.js*
+packages/python/plotly/plotly/package_data/widgetbundle.js
 
 test/percy/*.html
 test/percy/pandas2/*.html