Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
openbis
openbis-public
jupyter
jupyter-openbis-gui-server
Commits
edc18fb8
Commit
edc18fb8
authored
Apr 28, 2020
by
vermeul
Browse files
Merge branch 'release/0.1.4'
parents
6cc7123d
adfc8d1e
Changes
4
Hide whitespace changes
Inline
Side-by-side
jupyter-openbis-server/__init__.py
View file @
edc18fb8
name
=
'jupyter-openbis-server.server'
__author__
=
'Swen Vermeul'
__email__
=
'swen@ethz.ch'
__version__
=
'0.1.
3
'
__version__
=
'0.1.
4
'
def
_jupyter_server_extension_paths
():
return
[{
...
...
jupyter-openbis-server/connection.py
View file @
edc18fb8
...
...
@@ -63,7 +63,10 @@ class OpenBISConnection:
self
.
status
=
'connected'
def
get_info
(
self
):
mountpoint
=
self
.
openbis
.
get_mountpoint
()
is_mounted
=
self
.
openbis
.
is_mounted
()
mountpoint
=
''
if
is_mounted
:
mountpoint
=
self
.
openbis
.
get_mountpoint
()
return
{
'name'
:
self
.
name
,
...
...
@@ -71,7 +74,7 @@ class OpenBISConnection:
'status'
:
self
.
status
,
'username'
:
self
.
username
,
'password'
:
"******"
,
'isMounted'
:
self
.
openbis
.
is_mounted
(
mountpoint
)
,
'isMounted'
:
is_mounted
,
'mountpoint'
:
mountpoint
,
}
...
...
jupyter-openbis-server/dataset.py
View file @
edc18fb8
...
...
@@ -47,7 +47,7 @@ class DataSetDownloadHandler(IPythonHandler):
'location'
:
dataset
.
physicalData
.
location
,
'size'
:
dataset
.
physicalData
.
size
,
'files'
:
dataset
.
file_list
,
'statusText'
:
'Data for DataSet {} was successfully downloaded to: {}
.
'
.
format
(
dataset
.
permId
,
path
)
'statusText'
:
'Data for DataSet {} was successfully downloaded to: {}'
.
format
(
dataset
.
permId
,
path
)
})
def
get
(
self
,
**
params
):
...
...
setup.py
View file @
edc18fb8
...
...
@@ -11,7 +11,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
setup
(
name
=
'jupyter-openbis-server'
,
version
=
'0.1.
3
'
,
version
=
'0.1.
4
'
,
author
=
'Swen Vermeul | ID SIS | ETH Zürich'
,
author_email
=
'swen@ethz.ch'
,
description
=
'Server Extension for Jupyter notebooks to connect to openBIS and download/upload datasets, inluding the notebook itself'
,
...
...
@@ -23,7 +23,7 @@ setup(
install_requires
=
[
'jupyter-nbextensions-configurator'
,
'jupyter'
,
'pybis>=1.14.
3
'
,
'pybis>=1.14.
5
'
,
'numpy'
,
'tornado==5.1.1'
,
],
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment