Update code format

voila-dashboards · Oct 4, 2021 · f14a5ea · f14a5ea
1 parent e3d8a3e
commit f14a5ea
Show file tree

Hide file tree

Showing 19 changed files with 64 additions and 50 deletions.
diff --git a/tests/app/cgi-test.py b/tests/app/cgi-test.py
@@ -14,7 +14,7 @@ def notebook_cgi_path(base_url, preheat_mode):
 def voila_args(notebook_directory, voila_args_extra, preheat_mode):
     if preheat_mode:
         return [
-            os.path.join(notebook_directory,NOTEBOOK_PATH),
+            os.path.join(notebook_directory, NOTEBOOK_PATH),
             '--VoilaTest.log_level=DEBUG'
         ] + voila_args_extra
 

diff --git a/tests/app/conftest.py b/tests/app/conftest.py
@@ -10,6 +10,7 @@ class VoilaTest(voila.app.Voila):
     def listen(self):
         pass  # the ioloop is taken care of by the pytest-tornado framework
 
+
 @pytest.fixture
 def voila_config():
     return lambda app: None
@@ -31,6 +32,7 @@ def voila_args(voila_notebook, voila_args_extra, voila_config_file_paths_arg):
     debug_args = ['--VoilaTest.log_level=DEBUG'] if os.environ.get('VOILA_TEST_DEBUG', False) else []
     return [voila_notebook, voila_config_file_paths_arg] + voila_args_extra + debug_args
 
+
 @pytest.fixture(params=[False, True])
 def preheat_mode(request):
     """Fixture used to activate/deactivate pre-heat kernel mode.
@@ -39,13 +41,14 @@ def preheat_mode(request):
     """
     return request.param
 
+
 @pytest.fixture
 def preheat_config(preheat_mode):
     return f'--preheat_kernel={preheat_mode}'
 
-    
+
 @pytest.fixture
-def voila_app( voila_args, voila_config, preheat_config):
+def voila_app(voila_args, voila_config, preheat_config):
     voila_app = VoilaTest.instance()
     voila_app.initialize(voila_args + ['--no-browser', preheat_config])
     voila_config(voila_app)
@@ -59,10 +62,11 @@ def voila_app( voila_args, voila_config, preheat_config):
 def app(voila_app):
     return voila_app.app
 
+
 @pytest.fixture
 def wait_for_kernel(preheat_mode):
     """Wait for kernel be heated in case of `preheat_mode = True`"""
     async def inner(time=1):
         if preheat_mode:
             await asyncio.sleep(time)
-    return inner
+    return inner
diff --git a/tests/app/cwd_test.py b/tests/app/cwd_test.py
@@ -3,6 +3,7 @@
 
 import os
 
+
 @pytest.fixture
 def voila_notebook(notebook_directory):
     return os.path.join(notebook_directory, 'cwd.ipynb')

diff --git a/tests/app/execute_cpp_test.py b/tests/app/execute_cpp_test.py
@@ -4,6 +4,7 @@
 TEST_XEUS_CLING = os.environ.get('VOILA_TEST_XEUS_CLING', '') == '1'
 NOTEBOOK_PATH = 'print.xcpp'
 
+
 @pytest.fixture
 def cpp_file_url(base_url, preheat_mode):
     if preheat_mode:
@@ -19,7 +20,7 @@ def voila_args_extra():
 @pytest.fixture
 def voila_args(notebook_directory, voila_args_extra, preheat_mode):
     if preheat_mode:
-        return [os.path.join(notebook_directory,NOTEBOOK_PATH) ] + voila_args_extra
+        return [os.path.join(notebook_directory, NOTEBOOK_PATH)] + voila_args_extra
     return ['--VoilaTest.root_dir=%r' % notebook_directory] + voila_args_extra
 
 

diff --git a/tests/app/image_inlining_test.py b/tests/app/image_inlining_test.py
@@ -7,6 +7,7 @@
 
 NOTEBOOK_PATH = 'images.ipynb'
 
+
 @pytest.fixture
 def voila_notebook(notebook_directory):
     return os.path.join(notebook_directory, NOTEBOOK_PATH)

diff --git a/tests/app/no_kernelspec_test.py b/tests/app/no_kernelspec_test.py
@@ -1,5 +1,6 @@
 import pytest
-import os 
+import os
+
 
 NOTEBOOK_PATH = 'no_kernelspec.ipynb'
 
@@ -14,7 +15,7 @@ def non_existing_kernel_notebook(base_url, preheat_mode):
 @pytest.fixture
 def voila_args(notebook_directory, voila_args_extra, preheat_mode):
     if preheat_mode:
-        return [os.path.join(notebook_directory,NOTEBOOK_PATH)] + voila_args_extra
+        return [os.path.join(notebook_directory, NOTEBOOK_PATH)] + voila_args_extra
 
     return ['--VoilaTest.root_dir=%r' % notebook_directory] + voila_args_extra
 

diff --git a/tests/app/no_metadata.py b/tests/app/no_metadata.py
@@ -14,7 +14,7 @@ def non_existing_notebook_metadata(base_url, preheat_mode):
 @pytest.fixture
 def voila_args(notebook_directory, voila_args_extra, preheat_mode):
     if preheat_mode:
-        return [os.path.join(notebook_directory,NOTEBOOK_PATH)] + voila_args_extra
+        return [os.path.join(notebook_directory, NOTEBOOK_PATH)] + voila_args_extra
     return ['--VoilaTest.root_dir=%r' % notebook_directory] + voila_args_extra
 
 

diff --git a/tests/app/non_existing_kernel_test.py b/tests/app/non_existing_kernel_test.py
@@ -14,7 +14,7 @@ def non_existing_kernel_notebook(base_url, preheat_mode):
 @pytest.fixture
 def voila_args(notebook_directory, voila_args_extra, preheat_mode):
     if preheat_mode:
-        return [os.path.join(notebook_directory,NOTEBOOK_PATH)] + voila_args_extra
+        return [os.path.join(notebook_directory, NOTEBOOK_PATH)] + voila_args_extra
     return ["--VoilaTest.root_dir=%r" % notebook_directory] + voila_args_extra
 
 

diff --git a/tests/app/notebooks_test.py b/tests/app/notebooks_test.py
@@ -16,7 +16,7 @@ def notebook_other_comms_path(base_url, preheat_mode):
 def voila_args(notebook_directory, voila_args_extra, preheat_mode):
     if preheat_mode:
         return [
-            os.path.join(notebook_directory,NOTEBOOK_PATH),
+            os.path.join(notebook_directory, NOTEBOOK_PATH),
             '--VoilaTest.log_level=DEBUG',
         ] + voila_args_extra
     return [

diff --git a/tests/app/preheat_activation_test.py b/tests/app/preheat_activation_test.py
@@ -3,14 +3,17 @@
 import asyncio
 import os
 
+
 @pytest.fixture
 def preheat_mode():
     return True
 
+
 @pytest.fixture
 def voila_notebook(notebook_directory):
     return os.path.join(notebook_directory, 'pre_heat.ipynb')
 
+
 NOTEBOOK_EXECUTION_TIME = 2
 
 

diff --git a/tests/app/preheat_configuration_test.py b/tests/app/preheat_configuration_test.py
@@ -4,6 +4,9 @@
 import os
 
 BASE_DIR = os.path.dirname(__file__)
+NOTEBOOK_EXECUTION_TIME = 2
+NUMBER_PREHEATED_KERNEL = 2
+
 
 @pytest.fixture
 def voila_config_file_paths_arg():
@@ -15,12 +18,11 @@ def voila_config_file_paths_arg():
 def preheat_mode():
     return True
 
+
 @pytest.fixture
 def voila_notebook(notebook_directory):
     return os.path.join(notebook_directory, 'pre_heat.ipynb')
 
-NOTEBOOK_EXECUTION_TIME = 2
-NUMBER_PREHEATED_KERNEL = 2
 
 async def send_request(sc, url, wait=0):
     await asyncio.sleep(wait)
@@ -41,7 +43,7 @@ async def test_refill_kernel_asynchronously(http_server_client, base_url):
             fast.append(time)
         else:
             slow.append(time)
-    
+
     assert len(fast) > 1
     assert len(slow) > 1
     assert len(fast) + len(slow) == 5*NUMBER_PREHEATED_KERNEL
@@ -51,4 +53,3 @@ async def test_env_variable_defined_in_kernel(http_server_client, base_url):
     await asyncio.sleep(NUMBER_PREHEATED_KERNEL*NOTEBOOK_EXECUTION_TIME + 1)
     _, text = await send_request(sc=http_server_client, url=base_url)
     assert "bar" in text
-
diff --git a/tests/app/serve_directory_test.py b/tests/app/serve_directory_test.py
@@ -2,12 +2,15 @@
 import os
 import pytest
 
+
 TEST_XEUS_CLING = os.environ.get('VOILA_TEST_XEUS_CLING', '') == '1'
 
+
 @pytest.fixture
 def preheat_mode():
     return False
 
+
 @pytest.fixture
 def voila_args(notebook_directory, voila_args_extra):
     return ['--VoilaTest.root_dir=%r' % notebook_directory, '--VoilaTest.log_level=DEBUG'] + voila_args_extra

diff --git a/tests/app/show_traceback_test.py b/tests/app/show_traceback_test.py
@@ -8,17 +8,19 @@
 def show_tracebacks(request):
     return request.param
 
+
 @pytest.fixture
 def notebook_show_traceback_path(base_url, preheat_mode):
     if preheat_mode:
         return base_url
     return base_url + f'voila/render/{NOTEBOOK_PATH}'
 
+
 @pytest.fixture
 def voila_args(notebook_directory, voila_args_extra, show_tracebacks, preheat_mode):
     if preheat_mode:
         return [
-            os.path.join(notebook_directory,NOTEBOOK_PATH),
+            os.path.join(notebook_directory, NOTEBOOK_PATH),
             f'--VoilaConfiguration.show_tracebacks={show_tracebacks}',
         ] + voila_args_extra
     return [

diff --git a/tests/app/tree_test.py b/tests/app/tree_test.py
@@ -6,6 +6,7 @@
 def preheat_mode():
     return False
 
+
 @pytest.fixture
 def voila_args(notebook_directory, voila_args_extra):
     return ['--VoilaTest.root_dir=%r' % notebook_directory, '--VoilaTest.log_level=DEBUG'] + voila_args_extra

diff --git a/voila/app.py b/voila/app.py
@@ -416,7 +416,6 @@ def start(self):
         read_config_path += [os.path.join(p, 'nbconfig') for p in jupyter_config_path()]
         self.config_manager = ConfigManager(parent=self, read_config_path=read_config_path)
         self.contents_manager = LargeFileManager(parent=self)
-
         preheat_kernel = self.notebook_path is not None and self.voila_configuration.preheat_kernel
         kernel_manager_class = voila_kernel_manager_factory(
             self.voila_configuration.multi_kernel_manager_class,
@@ -440,9 +439,6 @@ def start(self):
         env = jinja2.Environment(loader=jinja2.FileSystemLoader(self.template_paths), extensions=['jinja2.ext.i18n'], **jenv_opt)
         nbui = gettext.translation('nbui', localedir=os.path.join(ROOT, 'i18n'), fallback=True)
         env.install_gettext_translations(nbui, newstyle=False)
-
-
-
 
         # default server_url to base_url
         self.server_url = self.server_url or self.base_url

diff --git a/voila/handler.py b/voila/handler.py
@@ -77,7 +77,7 @@ async def get(self, path=None):
         try:
             notebook_html_dict: Dict = self.kernel_manager.notebook_html
             notebook_data: Dict = self.kernel_manager.notebook_data.get(notebook_path, {})
-        except:
+        except Exception:
             # Extension mode
             notebook_html_dict = notebook_data = {}
         # If we have a heated kernel in pool, use it

diff --git a/voila/notebook_renderer.py b/voila/notebook_renderer.py
@@ -22,14 +22,13 @@
 from nbconvert.preprocessors import ClearOutputPreprocessor
 from traitlets.config.configurable import LoggingConfigurable
 
-from ._version import __version__
 from .execute import VoilaExecutor, strip_code_cell_warnings
 from .exporter import VoilaExporter
 from .paths import collect_template_paths
 
 
 class NotebookRenderer(LoggingConfigurable):
-    """Render the notebook into HTML string."""    
+    """Render the notebook into HTML string."""
 
     def __init__(self, **kwargs):
         super().__init__()
@@ -159,7 +158,7 @@ def inner_cell_generator(nb, kernel_id):
         # These functions allow the start of a kernel and execution of the
         # notebook after (parts of) the template has been rendered and send
         # to the client to allow progressive rendering.
-        # Template should first call kernel_start, and then decide to use 
+        # Template should first call kernel_start, and then decide to use
         # notebook_executer cell_generator to implement progressive cell rendering
 
         extra_context = {
@@ -209,7 +208,7 @@ async def _jinja_kernel_start(self, nb, kernel_id, kernel_future):
     async def _jinja_notebook_execute(self, nb, kernel_id):
 
         result = await self.executor.async_execute(cleanup_kc=False)
-        # we modify the notebook in place, since the nb variable cannot be 
+        # we modify the notebook in place, since the nb variable cannot be
         # reassigned it seems in jinja2 e.g. if we do {% with nb = notebook_execute(nb, kernel_id) %}
         # ,the base template/blocks will not see the updated variable
         #  (it seems to be local to our block)

diff --git a/voila/utils.py b/voila/utils.py
@@ -10,7 +10,6 @@
 import os
 
 
-
 def get_server_root_dir(settings):
     # notebook >= 5.0.0 has this in the settings
     if 'server_root_dir' in settings: