Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion renga/cli/notebooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
from binascii import hexlify

import click
from notebook.services.config import ConfigManager

from renga.cli._options import option_endpoint

Expand Down Expand Up @@ -52,6 +51,8 @@ def notebooks():
)
def configure(url, client_id):
"""Configure the Jupyter server extension."""
from notebook.services.config import ConfigManager

cm = ConfigManager()
cm.update('renga.notebook.oic', {
'client_id': client_id,
Expand Down
9 changes: 4 additions & 5 deletions renga/cli/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
import pkg_resources
import yaml

from renga.notebook import generate_launch_args, generate_notebook_token

from ._client import pass_local_client

_GITLAB_CI = '.gitlab-ci.yml'
Expand Down Expand Up @@ -121,12 +119,13 @@ def default_base_url():
)
@click.option('--base-url', default=default_base_url)
@click.option('--repo-url', envvar='CI_REPOSITORY_URL')
@click.option(
'--token', envvar='RENGA_NOTEBOOK_TOKEN', default=generate_notebook_token
)
@click.option('--token', envvar='RENGA_NOTEBOOK_TOKEN', default=None)
@pass_local_client
def notebook(client, name, network, image, base_url, repo_url, token):
"""Launch notebook in a container."""
from renga.notebook import generate_launch_args, generate_notebook_token

token = token if token is not None else generate_notebook_token()
try:
call(['docker', 'rm', '--force', name])
except Exception:
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
'gitpython>=2.1.8',
'networkx>=2.1',
'pyld>=0.8.2',
'python-dateutil>=2.6.1',
'requests-oauthlib>=0.8.0',
'requests>=2.18.4',
'tabulate>=0.7.7',
Expand Down