From 1d8cbae8004503eee90986adb965debc7984b2d8 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 5 Apr 2026 06:13:29 +0000 Subject: [PATCH 1/2] Update from copier (2026-04-05T06:13:29) Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> --- .copier-answers.yaml | 2 +- .gitignore | 5 +++-- js/package.json | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.copier-answers.yaml b/.copier-answers.yaml index da278c3..cbc92a3 100644 --- a/.copier-answers.yaml +++ b/.copier-answers.yaml @@ -1,5 +1,5 @@ # Changes here will be overwritten by Copier -_commit: '1246721' +_commit: 9b579a3 _src_path: https://github.com/python-project-templates/base.git add_docs: true add_extension: jupyter diff --git a/.gitignore b/.gitignore index 212ec63..89ce504 100644 --- a/.gitignore +++ b/.gitignore @@ -112,11 +112,12 @@ dmypy.json /site index.md docs/_build/ -docs/src/_build/ docs/api -docs/index.md docs/html +docs/index.md docs/jupyter_execute +docs/src/_build/ +docs/superpowers index.md # JS diff --git a/js/package.json b/js/package.json index b8e04df..04425d4 100644 --- a/js/package.json +++ b/js/package.json @@ -50,8 +50,13 @@ "@lumino/disposable": "^2.1.5" }, "devDependencies": { +<<<<<<< before updating "@babel/cli": "^7.28.6", "@babel/core": "^7.29.0", +======= + "@babel/cli": "^7.28.3", + "@babel/core": "^7.28.5", +>>>>>>> after updating "@babel/eslint-parser": "^7.28.6", "@babel/preset-env": "^7.29.2", "@jupyterlab/builder": "^4.5.6", From 1ac9f1bd6a1e09b135fca1dd49287234f261a875 Mon Sep 17 00:00:00 2001 From: Tim Paine <3105306+timkpaine@users.noreply.github.com> Date: Sun, 5 Apr 2026 19:12:40 -0400 Subject: [PATCH 2/2] fix conflict --- js/package.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/js/package.json b/js/package.json index 04425d4..b8e04df 100644 --- a/js/package.json +++ b/js/package.json @@ -50,13 +50,8 @@ "@lumino/disposable": "^2.1.5" }, "devDependencies": { -<<<<<<< before updating "@babel/cli": "^7.28.6", "@babel/core": "^7.29.0", -======= - "@babel/cli": "^7.28.3", - "@babel/core": "^7.28.5", ->>>>>>> after updating "@babel/eslint-parser": "^7.28.6", "@babel/preset-env": "^7.29.2", "@jupyterlab/builder": "^4.5.6",