rename widget

cbouy · cbouy · commit 649d5462e594 · 2022-09-04T14:00:40.000+02:00
diff --git a/docs/contents.md b/docs/contents.md
@@ -29,6 +29,11 @@ Alternatively, you can also use pip:
 pip install rdkit mols2grid
 ```
 
+To use it in **Jupyter Lab**, you must also install the extension:
+```shell
+jupyter labextension install mols2grid
+```
+
 **Compatibility**
 
 mols2grid is mainly meant to be used in notebooks (Jupyter notebooks, Jupyter Lab, and Google Colab) but it can also be used as a standalone HTML page opened with your favorite web browser, or embedded in a Streamlit app.
diff --git a/install.json b/install.json
@@ -1,5 +1,5 @@
 {
   "packageManager": "python",
-  "packageName": "mols2grid_widget",
-  "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package mols2grid_widget"
+  "packageName": "mols2grid",
+  "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package mols2grid"
 }
diff --git a/mols2grid.json b/mols2grid.json
@@ -0,0 +1,5 @@
+{
+  "load_extensions": {
+    "mols2grid/extension": true
+  }
+}
diff --git a/mols2grid/__init__.py b/mols2grid/__init__.py
@@ -6,6 +6,7 @@
 from .utils import (sdf_to_dataframe,
                     make_popup_callback)
 from ._version import __version__
+from .widget import _jupyter_labextension_paths, _jupyter_nbextension_paths
 
 try:
     from google.colab import output
diff --git a/mols2grid/_version.py b/mols2grid/_version.py
@@ -1,4 +1,4 @@
-version_info = (1, 0, 0, "rc5")
+version_info = (1, 0, 0, "rc6")
 
 __version__ = ".".join(map(str, version_info[:3]))
 if len(version_info) > 3:
diff --git a/mols2grid/nbextension/extension.js b/mols2grid/nbextension/extension.js
@@ -6,7 +6,7 @@ define(function() {
     window['requirejs'].config({
         map: {
             '*': {
-                'mols2grid_widget': 'nbextensions/mols2grid_widget/index',
+                'mols2grid': 'nbextensions/mols2grid/index',
             },
         }
     });
diff --git a/mols2grid/widget/__init__.py b/mols2grid/widget/__init__.py
@@ -13,8 +13,8 @@ def _jupyter_labextension_paths():
         during widget installation
     """
     return [{
-        'src': '../labextension',
-        'dest': 'mols2grid_widget',
+        'src': './labextension',
+        'dest': 'mols2grid',
     }]
 
 
@@ -36,7 +36,7 @@ def _jupyter_nbextension_paths():
     """
     return [{
         'section': 'notebook',
-        'src': '../nbextension',
-        'dest': 'mols2grid_widget',
-        'require': 'mols2grid_widget/extension'
+        'src': './nbextension',
+        'dest': 'mols2grid',
+        'require': 'mols2grid/extension'
     }]
diff --git a/mols2grid/widget/_frontend.py b/mols2grid/widget/_frontend.py
@@ -3,5 +3,5 @@
 """
 from .._version import __version__
 
-module_name = "mols2grid_widget"
+module_name = "mols2grid"
 module_version = f"^{__version__}"
diff --git a/mols2grid_widget.json b/mols2grid_widget.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "mols2grid_widget",
-  "version": "1.0.0-rc5",
+  "name": "mols2grid",
+  "version": "1.0.0-rc6",
   "description": "Custom widget for mols2grid",
   "keywords": [
     "jupyter",
diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@
 name = 'mols2grid'
 
 # Get the version
-version = get_version(pjoin(name, '_version.py'))
+version = get_version(pjoin(HERE, name, '_version.py'))
 
 # Representative files that should exist after a successful build
 jstargets = [
@@ -33,10 +33,10 @@
 }
 
 data_files_spec = [
-    ('share/jupyter/nbextensions/mols2grid_widget', 'mols2grid/nbextension', '**'),
-    ('share/jupyter/labextensions/mols2grid_widget', 'mols2grid/labextension', '**'),
-    ('share/jupyter/labextensions/mols2grid_widget', '.', 'install.json'),
-    ('etc/jupyter/nbconfig/notebook.d', '.', 'mols2grid_widget.json'),
+    ('share/jupyter/nbextensions/mols2grid', 'mols2grid/nbextension', '**'),
+    ('share/jupyter/labextensions/mols2grid', 'mols2grid/labextension', '**'),
+    ('share/jupyter/labextensions/mols2grid', '.', 'install.json'),
+    ('etc/jupyter/nbconfig/notebook.d', '.', 'mols2grid.json'),
 ]
 
 cmdclass = create_cmdclass(
diff --git a/src/extension.ts b/src/extension.ts
@@ -11,6 +11,6 @@
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 (window as any).__webpack_public_path__ =
   document.querySelector('body')!.getAttribute('data-base-url') +
-  'nbextensions/mols2grid_widget';
+  'nbextensions/mols2grid';
 
 export * from './index';
diff --git a/src/plugin.ts b/src/plugin.ts
@@ -11,7 +11,7 @@ import * as widgetExports from './widget';
 
 import { MODULE_NAME, MODULE_VERSION } from './version';
 
-const EXTENSION_ID = 'mols2grid_widget:plugin';
+const EXTENSION_ID = 'mols2grid:plugin';
 
 /**
  * The example plugin.
diff --git a/webpack.config.js b/webpack.config.js
@@ -40,7 +40,7 @@ module.exports = [
   },
 
   /**
-   * Embeddable mols2grid_widget bundle
+   * Embeddable mols2grid bundle
    *
    * This bundle is almost identical to the notebook extension bundle. The only
    * difference is in the configuration of the webpack public path for the
@@ -55,8 +55,8 @@ module.exports = [
         filename: 'index.js',
         path: path.resolve(__dirname, 'dist'),
         libraryTarget: 'amd',
-        library: "mols2grid_widget",
-        publicPath: 'https://unpkg.com/mols2grid_widget@' + version + '/dist/'
+        library: "mols2grid",
+        publicPath: 'https://unpkg.com/mols2grid@' + version + '/dist/'
     },
     devtool: 'source-map',
     module: {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"packageManager": "python",`
`3`		`- "packageName": "mols2grid_widget",`
`4`		`- "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package mols2grid_widget"`
	`3`	`+ "packageName": "mols2grid",`
	`4`	`+ "uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package mols2grid"`
`5`	`5`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "load_extensions": {
 +    "mols2grid/extension": true
 +  }
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version_info = (1, 0, 0, "rc5")`
	`1`	`+version_info = (1, 0, 0, "rc6")`
`2`	`2`
`3`	`3`	`__version__ = ".".join(map(str, version_info[:3]))`
`4`	`4`	`if len(version_info) > 3:`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ define(function() {`
`6`	`6`	`window['requirejs'].config({`
`7`	`7`	`map: {`
`8`	`8`	`'*': {`
`9`		`- 'mols2grid_widget': 'nbextensions/mols2grid_widget/index',`
	`9`	`+ 'mols2grid': 'nbextensions/mols2grid/index',`
`10`	`10`	`},`
`11`	`11`	`}`
`12`	`12`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "name": "mols2grid_widget",`
`3`		`- "version": "1.0.0-rc5",`
	`2`	`+ "name": "mols2grid",`
	`3`	`+ "version": "1.0.0-rc6",`
`4`	`4`	`"description": "Custom widget for mols2grid",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"jupyter",`