Rename and rebase

Author: fcollonval

.gitignore

@@ -49,6 +49,6 @@ doc/.ipynb_checkpoints
 tags
 doc/check-or-enforce-order.py
 
-packages/javascript/plotlywidget/lib/
-packages/python/plotly/plotlywidget/labextension/
-packages/python/plotly/plotlywidget/nbextension/index.js*
+packages/javascript/jupyterlab-plotly/lib/
+packages/python/plotly/jupyterlab_plotly/labextension/
+packages/python/plotly/jupyterlab_plotly/nbextension/index.js*

packages/javascript/plotlywidget/README.md renamed to packages/javascript/jupyterlab-plotly/README.md

@@ -1,5 +1,5 @@
 {
-  "name": "plotlywidget",
+  "name": "jupyterlab-plotly",
   "version": "4.14.3",
   "description": "The plotly Jupyter extension",
   "author": "The plotly.py team",
@@ -30,8 +30,8 @@
     "build:nbextension": "webpack --mode=production",
     "clean": "npm run clean:lib && npm run clean:nbextension && npm run clean:labextension",
     "clean:lib": "rimraf lib",
-    "clean:labextension": "rimraf ../../python/plotly/plotlywidget/labextension",
-    "clean:nbextension": "rimraf ../../python/plotly/plotlywidget/nbextension/index.js*",
+    "clean:labextension": "rimraf ../../python/plotly/jupyterlab_plotly/labextension",
+    "clean:nbextension": "rimraf ../../python/plotly/jupyterlab_plotly/nbextension/index.js*",
     "lint": "eslint . --ext .ts,.tsx --fix",
     "lint:check": "eslint . --ext .ts,.tsx",
     "prepack": "npm run build:lib",
@@ -70,7 +70,7 @@
   "jupyterlab": {
     "extension": "lib/jupyterlab-plugin",
     "mimeExtension": "lib/plotly-renderer",
-    "outputDir": "../../python/plotly/plotlywidget/labextension",
+    "outputDir": "../../python/plotly/jupyterlab_plotly/labextension",
     "sharedPackages": {
       "@jupyter-widgets/base": {
         "bundled": false,

packages/javascript/jupyterlab-plotly/package-lock.json

@@ -8,6 +8,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/plotlywidget';
+  'nbextensions/jupyterlab-plotly';
 
 export * from './index';

packages/javascript/plotlywidget/package.json renamed to packages/javascript/jupyterlab-plotly/package.json

@@ -24,7 +24,7 @@ function activateWidgetExtension(
  * The widget plugin.
  */
 const widgetPlugin: IPlugin<Application<Widget>, void> = ({
-  id: "plotlywidget",
+  id: "jupyterlab-plotly",
   requires: [IJupyterWidgetRegistry],
   activate: activateWidgetExtension,
   autoStart: true,

packages/javascript/plotlywidget/src/Figure.ts renamed to packages/javascript/jupyterlab-plotly/src/Figure.ts

@@ -31,7 +31,7 @@ module.exports = [
         "..",
         "python",
         "plotly",
-        "plotlywidget",
+        "jupyterlab_plotly",
         "nbextension"
       ),
       libraryTarget: "amd",
@@ -45,7 +45,7 @@ module.exports = [
   },
 
   /**
-   * Embeddable plotlywidget bundle
+   * Embeddable jupyterlab-plotly 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
@@ -60,8 +60,8 @@ module.exports = [
       filename: "index.js",
       path: path.resolve(__dirname, "dist"),
       libraryTarget: "amd",
-      library: "plotlywidget",
-      publicPath: "https://unpkg.com/plotlywidget@" + version + "/dist/",
+      library: "jupyterlab-plotly",
+      publicPath: "https://unpkg.com/jupyterlab-plotly@" + version + "/dist/",
     },
     module: {
       rules: rules,

packages/javascript/plotlywidget/src/extension.ts renamed to packages/javascript/jupyterlab-plotly/src/extension.ts

@@ -1,5 +1,5 @@
 include LICENSE.txt
 include README.md
-include plotlywidget.json
+include jupyterlab-plotly.json
 include versioneer.py
 include plotly/_version.py

packages/javascript/plotlywidget/src/index.ts renamed to packages/javascript/jupyterlab-plotly/src/index.ts

@@ -0,0 +1,5 @@
+{
+  "load_extensions": {
+    "jupyterlab-plotly/extension": true
+  }
+}

packages/javascript/plotlywidget/src/jupyterlab-plugin.ts renamed to packages/javascript/jupyterlab-plotly/src/jupyterlab-plugin.ts

@@ -1,13 +1,13 @@
 def _jupyter_labextension_paths():
-    return [{"src": "labextension", "dest": "plotlywidget"}]
+    return [{"src": "labextension", "dest": "jupyterlab-plotly"}]
 
 
 def _jupyter_nbextension_paths():
     return [
         {
             "section": "notebook",
             "src": "nbextension",
-            "dest": "plotlywidget",
-            "require": "plotlywidget/extension",
+            "dest": "jupyterlab-plotly",
+            "require": "jupyterlab-plotly/extension",
         }
     ]

packages/javascript/plotlywidget/src/lib.d.ts renamed to packages/javascript/jupyterlab-plotly/src/lib.d.ts

@@ -7,7 +7,7 @@ define(function() {
     window['requirejs'].config({
         map: {
             '*': {
-                'plotlywidget': 'nbextensions/plotlywidget/index',
+                'jupyterlab-plotly': 'nbextensions/jupyterlab-plotly/index',
             },
         }
     });

packages/javascript/plotlywidget/src/plotly-renderer.ts renamed to packages/javascript/jupyterlab-plotly/src/plotly-renderer.ts

@@ -28,11 +28,11 @@ class BaseFigureWidget(BaseFigure, widgets.DOMWidget):
     # Widget traitlets are automatically synchronized with the FigureModel
     # JavaScript object
     _view_name = Unicode("FigureView").tag(sync=True)
-    _view_module = Unicode("plotlywidget").tag(sync=True)
+    _view_module = Unicode("jupyterlab-plotly").tag(sync=True)
     _view_module_version = Unicode(__frontend_version__).tag(sync=True)
 
     _model_name = Unicode("FigureModel").tag(sync=True)
-    _model_module = Unicode("plotlywidget").tag(sync=True)
+    _model_module = Unicode("jupyterlab-plotly").tag(sync=True)
     _model_module_version = Unicode(__frontend_version__).tag(sync=True)
 
     # ### _data and _layout ###

packages/javascript/plotlywidget/src/version.ts renamed to packages/javascript/jupyterlab-plotly/src/version.ts

@@ -316,7 +316,7 @@ def get_html():
 
     @pytest.mark.nodev
     def test_plotlyjs_version(self):
-        path = os.path.join(packages_root, "javascript", "plotlywidget", "package.json")
+        path = os.path.join(packages_root, "javascript", "jupyterlab-plotly", "package.json")
         with open(path, "rt") as f:
             package_json = json.load(f)
             expected_version = package_json["dependencies"]["plotly.js"]

packages/javascript/plotlywidget/style/index.css renamed to packages/javascript/jupyterlab-plotly/style/index.css

@@ -18,7 +18,7 @@
 
 here = os.path.dirname(os.path.abspath(__file__))
 project_root = os.path.dirname(os.path.dirname(os.path.dirname(here)))
-node_root = os.path.join(project_root, "packages", "javascript", "plotlywidget")
+node_root = os.path.join(project_root, "packages", "javascript", "jupyterlab-plotly")
 is_repo = os.path.exists(os.path.join(project_root, ".git"))
 
 npm_path = os.pathsep.join(
@@ -28,7 +28,7 @@
     ]
 )
 
-labstatic = "plotlywidget/labextension/static"
+labstatic = "jupyterlab_plotly/labextension/static"
 if not os.path.exists(labstatic):
     # Ensure the folder exists when we will look for files in it
     os.makedirs(labstatic)
@@ -44,7 +44,7 @@
 # Load plotly.js version from js/package.json
 def plotly_js_version():
     path = os.path.join(
-        project_root, "packages", "javascript", "plotlywidget", "package.json"
+        project_root, "packages", "javascript", "jupyterlab-plotly", "package.json"
     )
     with open(path, "rt") as f:
         package_json = json.load(f)
@@ -97,19 +97,19 @@ def update_package_data(distribution):
         distribution.data_files.extend(
             [
                 (
-                    "share/jupyter/labextensions/plotlywidget",
-                    ["plotlywidget/labextension/package.json",],
+                    "share/jupyter/labextensions/jupyterlab-plotly",
+                    ["jupyterlab_plotly/labextension/package.json",],
                 ),
                 (
-                    "share/jupyter/labextensions/plotlywidget/static",
+                    "share/jupyter/labextensions/jupyterlab-plotly/static",
                     [os.path.join(labstatic, f) for f in os.listdir(labstatic)],
                 ),
                 (
-                    "share/jupyter/nbextensions/plotlywidget",
+                    "share/jupyter/nbextensions/jupyterlab-plotly",
                     [
-                        "plotlywidget/nbextension/extension.js",
-                        "plotlywidget/nbextension/index.js",
-                        "plotlywidget/nbextension/index.js.LICENSE.txt",
+                        "jupyterlab_plotly/nbextension/extension.js",
+                        "jupyterlab_plotly/nbextension/index.js",
+                        "jupyterlab_plotly/nbextension/index.js.LICENSE.txt",
                     ],
                 ),
             ]
@@ -127,9 +127,9 @@ class NPM(Command):
     node_modules = os.path.join(node_root, "node_modules")
 
     targets = [
-        os.path.join(here, "plotlywidget", "nbextension", "extension.js"),
-        os.path.join(here, "plotlywidget", "nbextension", "index.js"),
-        os.path.join(here, "plotlywidget", "labextension", "package.json"),
+        os.path.join(here, "jupyterlab_plotly", "nbextension", "extension.js"),
+        os.path.join(here, "jupyterlab_plotly", "nbextension", "index.js"),
+        os.path.join(here, "jupyterlab_plotly", "labextension", "package.json"),
     ]
 
     def initialize_options(self):
@@ -195,7 +195,7 @@ def run(self):
             if not os.path.exists(t):
                 msg = "Missing file: %s" % t
                 if not has_npm:
-                    msg += "\nnpm is required to build a development version of plotlywidget"
+                    msg += "\nnpm is required to build a development version of jupyterlab-plotly"
                 raise ValueError(msg)
 
         # update package data in case this created new files
@@ -442,7 +442,7 @@ def run(self):
 
 
 class UpdatePlotlywidgetVersionCommand(Command):
-    description = "Update package.json version of plotlywidget"
+    description = "Update package.json version of jupyterlab-plotly"
 
     user_options = []
 
@@ -512,8 +512,8 @@ def run(self):
     python_requires=">=3.6",
     license="MIT",
     packages=[
+        "jupyterlab_plotly",
         "plotly",
-        "plotlywidget",
         "plotly.plotly",
         "plotly.offline",
         "plotly.io",
@@ -539,9 +539,9 @@ def run(self):
             "package_data/templates/*",
             "package_data/datasets/*",
         ],
-        "plotlywidget": ["nbextension/*", "labextension/*", "labextension/static/*"],
+        "jupyterlab_plotly": ["nbextension/*", "labextension/*", "labextension/static/*"],
     },
-    data_files=[("etc/jupyter/nbconfig/notebook.d", ["plotlywidget.json"]),],
+    data_files=[("etc/jupyter/nbconfig/notebook.d", ["jupyterlab-plotly.json"]),],
     install_requires=["tenacity>=6.2.0", "six"],
     zip_safe=False,
     cmdclass=dict(