Commit 6cc7123d authored by vermeul's avatar vermeul
Browse files

Merge branch 'release/0.1.3'

parents d90fa05d 8a6c480c
## jupyter-openbis-server 0.1.3
- enforce compatibility with pyBIS 1.14.3
## jupyter-openbis-server 0.1.2
- fixed missing re import bug
......
name = 'jupyter-openbis-server.server'
__author__ = 'Swen Vermeul'
__email__ = 'swen@ethz.ch'
__version__ = '0.1.2'
__version__ = '0.1.3'
def _jupyter_server_extension_paths():
return [{
......
......@@ -35,9 +35,9 @@ def get_datasets(entity, start_with=None, count=None):
def get_datasets_for_identifier(conn, identifier, start_with=None, count=None):
datasets = conn.openbis.get_datasets(sample=identifier, start_with=start_with, count=count)
datasets = conn.openbis.get_datasets(sample=identifier, props=['$name'], start_with=start_with, count=count)
if len(datasets) == 0:
datasets = conn.openbis.get_datasets(experiment=identifier, start_with=start_with, count=count)
datasets = conn.openbis.get_datasets(experiment=identifier, props=['$name'], start_with=start_with, count=count)
totalCount = datasets.totalCount
......
......@@ -11,7 +11,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
setup(
name='jupyter-openbis-server',
version= '0.1.2',
version= '0.1.3',
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.9.5',
'pybis>=1.14.3',
'numpy',
'tornado==5.1.1',
],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment