Skip to content

Commit

Permalink
Merge branch 'master' into hainm-patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
hainm authored Jan 9, 2024
2 parents 8db23b7 + 3b26976 commit f02980c
Show file tree
Hide file tree
Showing 17 changed files with 1,356 additions and 53,880 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
yarn-
- name: Install dependencies
run: python -m pip install -U jupyterlab~=3.0 jupyter_packaging~=0.7.9 jupyterlab_widgets~=1.0.0
run: python -m pip install -U jupyterlab jupyter_packaging jupyterlab_widgets
- name: Build the extension
working-directory: js
run: |
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ Released version
```

Jupyterlab: `nglview` works best with jupyterlab >= 3.0 and no further steps needed.
Known to work versions: nglview==3.0.8 ipywidgets==8.1.1 jupyterlab>4 works (Jan 08 20224)

## Notes

Expand Down
5 changes: 3 additions & 2 deletions devtools/nglview-jupyterlab.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
conda create -n lab python=3.8 -y
conda create -n lab python=3.11 -y
source activate lab
conda install jupyterlab=3 nglview -c conda-forge -y
# conda install jupyterlab=3 nglview -c conda-forge -y
conda install jupyterlab=3 -c conda-forge -y
17 changes: 0 additions & 17 deletions js/nglview-js-widgets/__init__.py

This file was deleted.

19 changes: 0 additions & 19 deletions js/nglview-js-widgets/_version.py

This file was deleted.

13 changes: 7 additions & 6 deletions js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nglview-js-widgets",
"version": "3.0.8",
"version": "3.0.9",
"description": "nglview-js-widgets",
"keywords": [
"ipython",
Expand Down Expand Up @@ -55,16 +55,16 @@
"test": "mocha"
},
"dependencies": {
"@jupyter-widgets/base": "^4.0.0",
"@jupyter-widgets/base": "^1 || ^2.0.2 || ^3 || ^4 || ^5 || ^6",
"@jupyter-widgets/jupyterlab-manager": "^3.0.0",
"jquery": "^3.2.1",
"jquery-ui": "^1.12.1",
"lodash": "^4.17.4",
"ngl": "2.0.0-dev.39",
"ngl": "2.2.2",
"underscore": "^1.8.3"
},
"devDependencies": {
"@jupyterlab/builder": "^3.0.0",
"@jupyterlab/builder": "^3.0.5",
"@types/chai": "^4.1.4",
"@types/expect.js": "^0.3.29",
"@types/mocha": "^2.2.48",
Expand All @@ -78,7 +78,7 @@
"file-loader": "^1.1.6",
"json-loader": "^0.5.4",
"mkdirp": "^1.0.3",
"ngl": "2.0.0-dev.39",
"ngl": "2.2.2",
"npm-run-all": "^4.1.5",
"prettier": "^2.1.1",
"rimraf": "^3.0.2",
Expand All @@ -103,5 +103,6 @@
},
"directories": {
"test": "test"
}
},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion js/src/fullscreen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export
class FullscreenView extends BaseView{
stage : any
render() {
this.stage = new NGL.Stage()
this.stage = new NGL.Stage(null, null)
var that = this
this.model.on("msg:custom", function(msg){
that.on_msg(msg)
Expand Down
2 changes: 1 addition & 1 deletion nglview/_frontend.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__frontend_version__ = '3.0.8'
__frontend_version__ = '3.0.9'
Empty file removed nglview/scripts/__init__.py
Empty file.
40 changes: 0 additions & 40 deletions nglview/scripts/app.py

This file was deleted.

21 changes: 0 additions & 21 deletions nglview/scripts/cmd_example.py

This file was deleted.

Loading

0 comments on commit f02980c

Please sign in to comment.