lab 3 update

Author: hbcarlos

.gitignore

@@ -5,6 +5,8 @@ node_modules/
 .ipynb_checkpoints
 *.tsbuildinfo
 
+jupyterlab_interactive_dashboard_editor/labextension
+
 */labextension/*.tgz
 # Created by https://www.gitignore.io/api/python
 # Edit at https://www.gitignore.io/?templates=python

MANIFEST.in

@@ -1,22 +1,6 @@
 include LICENSE
 include README.md
 include pyproject.toml
+include install.json
 
-include jupyter-config/jupyterlab_interactive_dashboard_editor.json
-
-include package.json
-include ts*.json
-include jupyterlab_interactive_dashboard_editor/labextension/*.tgz
-
-# Javascript files
-graft src
-graft style
-prune **/node_modules
-prune lib
-
-# Patterns to exclude from any directory
-global-exclude *~
-global-exclude *.pyc
-global-exclude *.pyo
-global-exclude .git
-global-exclude .ipynb_checkpoints
+graft jupyterlab_interactive_dashboard_editor/labextension

install.json

@@ -14,6 +14,3 @@ def _jupyter_labextension_paths():
         'src': 'labextension',
         'dest': data['name']
     }]
-
-
-

jupyterlab-interactive-dashboard-editor/__init__.py renamed to jupyterlab_interactive_dashboard_editor/__init__.py

@@ -28,7 +28,7 @@
   "scripts": {
     "build": "jlpm run build:lib",
     "build:all": "jlpm run build:labextension",
-    "build:labextension": "cd jupyterlab_interactive_dashboard_editor && rimraf labextension && mkdirp labextension && cd labextension && npm pack ../..",
+    "build:labextension": "jlpm run clean:all && jlpm run build && jupyter labextension build .",
     "build:lib": "tsc",
     "clean": "jlpm run clean:lib",
     "clean:all": "jlpm run clean:lib && jlpm run clean:labextension",
@@ -75,8 +75,8 @@
     "style/index.js"
   ],
   "jupyterlab": {
-    "extension": true,
-    "outputDir": "jupyterlab-interactive-dashboard-editor/labextension"
+    "extension": "lib",
+    "outputDir": "jupyterlab_interactive_dashboard_editor/labextension"
   },
   "husky": {
     "hooks": {
@@ -87,4 +87,4 @@
     "*.{js,jsx,ts,tsx}": "eslint --cache --fix"
   },
   "styleModule": "style/index.js"
-}
+}

jupyterlab-interactive-dashboard-editor/_version.py renamed to jupyterlab_interactive_dashboard_editor/_version.py

@@ -2,59 +2,61 @@
 jupyterlab-interactive-dashboard-editor setup
 """
 import json
-import os
+from os import path
 
 from jupyter_packaging import (
     create_cmdclass, install_npm, ensure_targets,
     combine_commands, skip_if_exists
 )
+
 import setuptools
 
-HERE = os.path.abspath(os.path.dirname(__file__))
+HERE = path.abspath(path.dirname(__file__))
 
 # The name of the project
-name="jupyterlab-interactive-dashboard-editor"
+name = "jupyterlab-interactive-dashboard-editor"
+module = "jupyterlab_interactive_dashboard_editor"
+labext_name = "jupyterlab-interactive-dashboard-editor"
 
 # Get our version
-with open(os.path.join(HERE, 'package.json')) as f:
+with open(path.join(HERE, 'package.json')) as f:
     version = json.load(f)['version']
 
-lab_path = os.path.join(HERE, name, "labextension")
+lab_path = path.join(HERE, module, "labextension")
 
 # Representative files that should exist after a successful build
 jstargets = [
-    os.path.join(lab_path, "package.json"),
+    path.join(lab_path, "package.json"),
 ]
 
 package_data_spec = {
-    name: [
-        "*"
+    module: [
+        "labextension/*"
     ]
 }
 
-labext_name = "jupyterlab-interactive-dashboard-editor"
 
 data_files_spec = [
-    ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**"),
-    ("share/jupyter/labextensions/%s" % labext_name, HERE, "install.json"),
+    ("share/jupyter/labextensions/%s" % labext_name, lab_path, "**")
 ]
 
-cmdclass = create_cmdclass("jsdeps",
+
+cmdclass = create_cmdclass("js",
     package_data_spec=package_data_spec,
     data_files_spec=data_files_spec
 )
 
-js_command = combine_commands(
-    install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]),
+cmdclass['js'] = combine_commands(
+    install_npm(
+        path=HERE,
+        npm=["jlpm"],
+        build_cmd="build:labextension",
+        build_dir=path.join(HERE, 'dist'),
+        source_dir=path.join(HERE, 'src')
+    ),
     ensure_targets(jstargets),
 )
 
-is_repo = os.path.exists(os.path.join(HERE, ".git"))
-if is_repo:
-    cmdclass["jsdeps"] = js_command
-else:
-    cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command)
-
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
@@ -64,9 +66,9 @@
     url="https://github.com/jupytercalpoly/jupyterlab-interactive-dashboard-editor.git",
     author="jupytercalpoly",
     description="Interactively create and customize dashboards in JupyterLab",
-    long_description= long_description,
+    long_description=long_description,
     long_description_content_type="text/markdown",
-    cmdclass= cmdclass,
+    cmdclass=cmdclass,
     packages=setuptools.find_packages(),
     install_requires=[
         "jupyterlab>=3.0.0rc13,==3.*",
@@ -88,6 +90,5 @@
     ],
 )
 
-
 if __name__ == "__main__":
     setuptools.setup(**setup_args)