From 6a9e2c9c506302656235626b0be84e5f91ad95a7 Mon Sep 17 00:00:00 2001 From: Benoit Bovy Date: Fri, 28 Apr 2023 10:57:55 +0200 Subject: [PATCH] Fix classic notebook extension installation (#110) * fix classic notebook js extension path nbextension/static -> nbextension/ * update release notes * clean-up --- .gitignore | 2 +- docs/release_notes.rst | 9 +++++++++ ipytone/nbextension/__init__.py | 15 --------------- ipytone/nbextension/{static => }/extension.js | 0 pyproject.toml | 6 +++--- webpack.config.js | 2 +- 6 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 ipytone/nbextension/__init__.py rename ipytone/nbextension/{static => }/extension.js (100%) diff --git a/.gitignore b/.gitignore index 57ff8eb..cd4f55c 100644 --- a/.gitignore +++ b/.gitignore @@ -147,7 +147,7 @@ $RECYCLE.BIN/ # ---- **/node_modules/ -ipytone/nbextension/static/index.* +ipytone/nbextension/index.* ipytone/labextension/*.tgz .yarn/ diff --git a/docs/release_notes.rst b/docs/release_notes.rst index ee5ab2d..013a041 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -5,6 +5,15 @@ Release Notes ============= +v0.5.1 +------ + +Bug fixes +~~~~~~~~~ + +- Fixed installation issue with notebook "classic" version <7 (:issue:`109`, + :pull:`110`). + v0.5.0 ------ diff --git a/ipytone/nbextension/__init__.py b/ipytone/nbextension/__init__.py deleted file mode 100644 index 1a64cb3..0000000 --- a/ipytone/nbextension/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) Benoit Bovy -# Distributed under the terms of the Modified BSD License. - - -def _jupyter_nbextension_paths(): - return [ - { - "section": "notebook", - "src": "nbextension/static", - "dest": "ipytone", - "require": "ipytone/extension", - } - ] diff --git a/ipytone/nbextension/static/extension.js b/ipytone/nbextension/extension.js similarity index 100% rename from ipytone/nbextension/static/extension.js rename to ipytone/nbextension/extension.js diff --git a/pyproject.toml b/pyproject.toml index e722da4..d7494b4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ Homepage = "https://github.com/benbovy/ipytone" [tool.hatch.build] artifacts = [ - "ipytone/nbextension/static/index.*", + "ipytone/nbextension/index.*", "ipytone/labextension/*.tgz", "ipytone/labextension", ] @@ -79,11 +79,11 @@ exclude = [ [tool.hatch.build.hooks.jupyter-builder] build-function = "hatch_jupyter_builder.npm_builder" ensured-targets = [ - "ipytone/nbextension/static/index.js", + "ipytone/nbextension/index.js", "ipytone/labextension/package.json", ] skip-if-exists = [ - "ipytone/nbextension/static/index.js", + "ipytone/nbextension/index.js", "ipytone/labextension/package.json", ] dependencies = [ diff --git a/webpack.config.js b/webpack.config.js index 6b82b75..33e6e09 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -27,7 +27,7 @@ module.exports = [ entry: './src/extension.ts', output: { filename: 'index.js', - path: path.resolve(__dirname, 'ipytone', 'nbextension', 'static'), + path: path.resolve(__dirname, 'ipytone', 'nbextension'), libraryTarget: 'amd', }, module: {