-
Notifications
You must be signed in to change notification settings - Fork 194
feat: jupyter lab 3.0 federated bundle support #342
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
e4a3130
9e56751
6186fc1
49ffb97
df6afcf
fd5f133
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -26,21 +26,22 @@ | |||||
"build:all": "npm run build:labextension", | ||||||
"build:bundles": "webpack -d && node ./scripts/post-build.js --debug", | ||||||
"build:bundles-prod": "webpack -p && node ./scripts/post-build.js", | ||||||
"build:labextension": "rimraf lab-dist && mkdirp lab-dist && cd lab-dist && npm pack ..", | ||||||
"build:labextension": "rimraf lab-dist && mkdirp lab-dist && cd lab-dist && npm pack .. && cd .. && jupyter labextension build .", | ||||||
"clean": "rimraf dist && rimraf ../pythreejs/static && rimraf lab-dist && node ./scripts/clean-generated-files.js", | ||||||
"prepack": "npm run build:bundles-prod", | ||||||
"prepare": "npm run autogen", | ||||||
"update:deps": "update-dependency --minimal --regex \"^(?!@jupyter-widgets|three)\"", | ||||||
"watch": "webpack -d -w" | ||||||
}, | ||||||
"dependencies": { | ||||||
"@jupyter-widgets/base": "^1.2.5 || ^2.0.0 || ^3.0.0", | ||||||
"@jupyter-widgets/base": "^1.2.5 || ^2.0.0 || ^3.0.0 || ^4.0.0-alpha.2", | ||||||
"bluebird": "^3.5.5", | ||||||
"jupyter-dataserializers": "^2.2.0", | ||||||
"three": "^0.97.0", | ||||||
"underscore": "^1.8.3" | ||||||
}, | ||||||
"devDependencies": { | ||||||
"@jupyterlab/builder": "^3.0.0-rc.13", | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
"@jupyterlab/buildutils": "^2.0.2", | ||||||
"eslint": "^6.8.0", | ||||||
"fs-extra": "^8.1.0", | ||||||
|
@@ -53,6 +54,13 @@ | |||||
}, | ||||||
"jupyterlab": { | ||||||
"extension": "src/jupyterlab-plugin", | ||||||
"outputDir": "../share/jupyter/labextensions/jupyter-threejs", | ||||||
"sharedPackages": { | ||||||
"@jupyter-widgets/base": { | ||||||
"bundled": false, | ||||||
"singleton": true | ||||||
} | ||||||
}, | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It might be nice to hoist threejs as a shared package (non-singleton, ha!) |
||||||
"discovery": { | ||||||
"kernel": [ | ||||||
{ | ||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,7 @@ module.exports = { | |
console.error(err); | ||
reject(err); | ||
}, | ||
'jupyter-threejs' | ||
'jupyter-threejs-chunk' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This change is surprising to me. Why do you need There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the chunk name was not allowed to be the same name as package/module/forgotwhatitwasname, as long as it was not There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can confirm, have encountered this elsewhere |
||
); | ||
}); | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
[build-system] | ||
requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc4,==3.*", "setuptools>=40.8.0", "wheel"] | ||
build-backend = "setuptools.build_meta" |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,25 +4,20 @@ | |
import os | ||
import sys | ||
|
||
from setupbase import ( | ||
log, | ||
from jupyter_packaging import ( | ||
create_cmdclass, | ||
install_npm, | ||
combine_commands, | ||
ensure_targets, | ||
combine_commands, | ||
get_version, | ||
) | ||
|
||
from setuptools import setup | ||
|
||
|
||
log.set_verbosity(log.DEBUG) | ||
log.info('setup.py entered') | ||
log.info('$PATH=%s' % os.environ['PATH']) | ||
|
||
LONG_DESCRIPTION = 'A Python/ThreeJS bridge utilizing the Jupyter widget infrastructure.' | ||
|
||
here = os.path.abspath(os.path.dirname(sys.argv[0])) | ||
here = os.path.dirname(os.path.abspath(__file__)) | ||
name = 'pythreejs' | ||
version = get_version(os.path.join(here, name, '_version.py')) | ||
|
||
|
@@ -39,6 +34,12 @@ | |
('share/jupyter/lab/extensions', | ||
'js/lab-dist', | ||
'jupyter-threejs-*.tgz'), | ||
('share/jupyter/labextensions/jupyter-threejs/', | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
'share/jupyter/labextensions/jupyter-threejs/', | ||
'*.*'), | ||
('share/jupyter/labextensions/jupyter-threejs/static', | ||
'share/jupyter/labextensions/jupyter-threejs/static/', | ||
'*.*'), | ||
('etc/jupyter/nbconfig', | ||
'jupyter-config', | ||
'**/*.json'), | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.