Skip to content

Commit a40b0e5

Browse files
authored
Merge pull request #48 from yuvipanda/titles
Use lab & notebook extensions from nbserverproxy
2 parents 1414f1c + b9b0bc4 commit a40b0e5

File tree

9 files changed

+73
-235
lines changed

9 files changed

+73
-235
lines changed

jupyterlab-rsessionproxy/package.json

Lines changed: 0 additions & 53 deletions
This file was deleted.

jupyterlab-rsessionproxy/src/index.ts

Lines changed: 0 additions & 88 deletions
This file was deleted.

jupyterlab-rsessionproxy/style/index.css

Lines changed: 0 additions & 29 deletions
This file was deleted.

jupyterlab-rsessionproxy/tsconfig.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

nbrsessionproxy/__init__.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ def _get_shiny_cmd(port):
3131
return ['shiny-server', f.name]
3232

3333
return {
34-
'command': _get_shiny_cmd
34+
'command': _get_shiny_cmd,
35+
'title': 'Shiny',
36+
'icon': os.path.join(os.path.dirname(os.path.abspath(__file__)), 'icons', 'shiny.svg')
3537
}
3638

3739
def setup_rstudio():
@@ -64,5 +66,7 @@ def _get_rsession_env(port):
6466
'--user-identity=' + getpass.getuser(),
6567
'--www-port={port}'
6668
],
67-
'environment': _get_rsession_env
69+
'environment': _get_rsession_env,
70+
'title': 'RStudio',
71+
'icon': os.path.join(os.path.dirname(os.path.abspath(__file__)), 'icons', 'rstudio.svg')
6872
}
File renamed without changes.

nbrsessionproxy/icons/shiny.svg

Lines changed: 65 additions & 0 deletions
Loading

nbrsessionproxy/static/tree.js

Lines changed: 0 additions & 45 deletions
This file was deleted.

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
'notebook',
1414
'nbserverproxy >= 0.8.8'
1515
],
16-
package_data={'nbrsessionproxy': ['static/*']},
1716
entry_points={
1817
'jupyter_serverproxy_servers': [
1918
'rstudio = nbrsessionproxy:setup_rstudio',
2019
'shiny = nbrsessionproxy:setup_shiny'
2120
]
22-
}
21+
},
22+
include_package_data=True
2323
)

0 commit comments

Comments
 (0)