From a25da139f425f01536bfe1c47ba3e11230dc4271 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 9 Dec 2020 22:56:09 +0100 Subject: [PATCH 1/3] Ensure static --- MANIFEST.in | 6 +++--- setup.py | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 6389876c8..3f216b26a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,9 +7,9 @@ include package.json include install.json include ts*.json -graft jupyterlab-classic/labextension -graft jupyterlab-classic/static -graft jupyterlab-classic/templates +graft jupyterlab_classic/labextension +graft jupyterlab_classic/static +graft jupyterlab_classic/templates # Javascript files graft src diff --git a/setup.py b/setup.py index e8be8d392..574dc8ef2 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,9 @@ PACKAGE_NAME = NAME.replace("-", "_") # Get our version version = get_version(os.path.join(PACKAGE_NAME, "_version.py")) +main_bundle_dest = os.path.join(HERE, PACKAGE_NAME, "static") +main_bundle_source = os.path.join(HERE, "builder") + labext_name = "@jupyterlab-classic/lab-extension" lab_extension_dest = os.path.join(HERE, PACKAGE_NAME, "labextension") lab_extension_source = os.path.join(HERE, "packages", "lab-extension") @@ -29,6 +32,7 @@ lab_extension_source = os.path.join(HERE, "packages", "lab-extension") jstargets = [ os.path.join(lab_extension_source, "lib", "index.js"), os.path.join(lab_extension_dest, "package.json"), + os.path.join(main_bundle_dest, "bundle.js"), ] package_data_spec = {PACKAGE_NAME: ["*"]} @@ -53,7 +57,8 @@ cmdclass = create_cmdclass( ) cmdclass["jsdeps"] = combine_commands( - install_npm(lab_extension_source, build_cmd="build", npm=["jlpm"]), + install_npm(lab_extension_source, build_cmd="build:prod", npm=["jlpm"]), + install_npm(main_bundle_source, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) From f111d973aa512567b516019492fc830241f4c820 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 9 Dec 2020 23:07:36 +0100 Subject: [PATCH 2/3] Build all packages --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 574dc8ef2..f1c5becd3 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,6 @@ PACKAGE_NAME = NAME.replace("-", "_") version = get_version(os.path.join(PACKAGE_NAME, "_version.py")) main_bundle_dest = os.path.join(HERE, PACKAGE_NAME, "static") -main_bundle_source = os.path.join(HERE, "builder") labext_name = "@jupyterlab-classic/lab-extension" lab_extension_dest = os.path.join(HERE, PACKAGE_NAME, "labextension") @@ -57,8 +56,8 @@ cmdclass = create_cmdclass( ) cmdclass["jsdeps"] = combine_commands( - install_npm(lab_extension_source, build_cmd="build:prod", npm=["jlpm"]), - install_npm(main_bundle_source, build_cmd="build:prod", npm=["jlpm"]), + install_npm(HERE, build_cmd="install", npm=["jlpm"]), + install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), ) From 895df0ab5eb7eab6b1cb3ba87667afb4a4b0e6f1 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 9 Dec 2020 23:13:28 +0100 Subject: [PATCH 3/3] Fix build commands in setup.py --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f1c5becd3..6a8394b02 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ PACKAGE_NAME = NAME.replace("-", "_") version = get_version(os.path.join(PACKAGE_NAME, "_version.py")) main_bundle_dest = os.path.join(HERE, PACKAGE_NAME, "static") +main_bundle_source = os.path.join(HERE, "builder") labext_name = "@jupyterlab-classic/lab-extension" lab_extension_dest = os.path.join(HERE, PACKAGE_NAME, "labextension") @@ -57,7 +58,8 @@ cmdclass = create_cmdclass( cmdclass["jsdeps"] = combine_commands( install_npm(HERE, build_cmd="install", npm=["jlpm"]), - install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]), + install_npm(HERE, build_cmd="build", npm=["jlpm"]), + install_npm(main_bundle_source, build_cmd="build:prod", npm=["jlpm"]), ensure_targets(jstargets), )