From 08807eac4076c05caade82da206b5853705e6497 Mon Sep 17 00:00:00 2001 From: Yuriy Gorishniy Date: Tue, 27 Jun 2017 20:58:42 +0300 Subject: [PATCH] move initialization of options_form to __init__ --- etc/byor_config.py | 4 ---- everware/__init__.py | 2 +- everware/byor_spawner.py | 11 ++++++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/etc/byor_config.py b/etc/byor_config.py index 853dd7f..d8c096b 100644 --- a/etc/byor_config.py +++ b/etc/byor_config.py @@ -3,7 +3,3 @@ load_subconfig('etc/github_auth.py') c.JupyterHub.spawner_class = 'everware.ByorDockerSpawner' - -from os.path import join as pjoin -with open(pjoin(c.JupyterHub.template_paths[0], '_byor_options_form.html')) as form: - c.ByorDockerSpawner.options_form = form.read() diff --git a/everware/__init__.py b/everware/__init__.py index f6145b1..2c97277 100755 --- a/everware/__init__.py +++ b/everware/__init__.py @@ -1,4 +1,4 @@ -__version__ = "0.11.0" +__version__ = "0.12.0" from .spawner import * from .byor_spawner import * from .authenticator import * diff --git a/everware/byor_spawner.py b/everware/byor_spawner.py index ce635f2..544bdce 100644 --- a/everware/byor_spawner.py +++ b/everware/byor_spawner.py @@ -1,3 +1,5 @@ +from os.path import join as pjoin + import docker from docker.errors import DockerException from traitlets import Int @@ -7,9 +9,16 @@ class ByorDockerSpawner(CustomDockerSpawner): + + _options_form_is_initialized = False def __init__(self, **kwargs): - self._byor_client = None CustomDockerSpawner.__init__(self, **kwargs) + self._byor_client = None + if not self._options_form_is_initialized: + with open(pjoin(self.config['JupyterHub']['template_paths'][0], + '_byor_options_form.html')) as form: + ByorDockerSpawner.options_form = form.read() + ByorDockerSpawner._options_form_is_initialized = True @property def client(self):