Clean up unused imports, run black (#9)

* Clean up unused imports, run black

* More cleanup

* Fix workflow

* Fix missing pack_mounts

Author: jtpio

.github/workflows/main.yaml

@@ -12,14 +12,8 @@ defaults:
 
 
 jobs:
-
   test_with_conda:
-
     runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-
     steps:
       - uses: actions/checkout@v2
 
@@ -41,20 +35,15 @@ jobs:
         run: |
           micromamba activate dev-env
           python -m pip install . --no-deps
-        
-      - name: Run Tests 
+
+      - name: Run Tests
         run: |
           micromamba activate dev-env
           pytest -s
 
 
   test_with_pip:
-
     runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-
     steps:
       - uses: actions/checkout@v2
 
@@ -71,13 +60,10 @@ jobs:
       - name: Install pyjs-code-runner
         run: |
           micromamba activate dev-env
-          python -m pip install . 
+          python -m pip install .
           playwright install
-        
-      - name: Run Tests 
+
+      - name: Run Tests
         run: |
           micromamba activate dev-env
-
           pytest -s
-
- 

pyjs_code_runner/backend/backend.py

@@ -61,8 +61,9 @@ def ensure_playwright_imports():
 
 def get_backend_cls(backend_type):
     if backend_type == BackendType.node:
-        raise RuntimeError("the node backend is currently disabled as its not (yet) working with empack>=3.0.0")
-
+        raise RuntimeError(
+            "the node backend is currently disabled as its not (yet) working with empack>=3.0.0"
+        )
 
     elif backend_type == BackendType.browser_main:
         ensure_playwright_imports()

pyjs_code_runner/backend/browser_main/browser_main.py

@@ -28,7 +28,6 @@ def __init__(
         self.slow_mo = slow_mo
 
     def run(self):
-
         browser_main_html = "browser_main.html"
         main = HTML_DIR / browser_main_html
         shutil.copyfile(main, self.host_work_dir / browser_main_html)

pyjs_code_runner/backend/browser_worker/browser_worker.py

@@ -25,7 +25,6 @@ def __init__(
         self.slow_mo = slow_mo
 
     def run(self):
-
         # copy html
         browser_worker_html = "browser_worker.html"
         main = HTML_DIR / browser_worker_html
@@ -40,7 +39,6 @@ def run(self):
             server,
             url,
         ):
-
             page_url = f"{url}/{browser_worker_html}"
             ret = asyncio.run(self.playwright_run_in_worker_thread(page_url=page_url))
             if ret != 0:
@@ -97,10 +95,8 @@ async def handle_worker(worker):
 
             async def handle_console(msg):
                 txt = str(msg)
-                if (
-                    txt.startswith(
-                        "warning: Browser does not support creating object URLs"
-                    )
+                if txt.startswith(
+                    "warning: Browser does not support creating object URLs"
                 ):
                     pass
                 else:

pyjs_code_runner/cli/run.py

@@ -1,7 +1,5 @@
-import os
 from pathlib import Path
 from typing import List, Optional
-import json
 import typer
 
 
@@ -53,7 +51,7 @@ def parse_mounts(mounts):
 script_option = require_option(
     *make_names("script"), help="path of script inside the virtual fileystem to run"
 )
-relocate_prefix_option =  typer.Option(
+relocate_prefix_option = typer.Option(
     "/",
     *make_names("relocate-prefix"),
     help="location of the conda environment in the virtual file",
@@ -238,15 +236,14 @@ def run_script(
     use_cache,
     backend_kwargs=None,
 ):
-
     if backend_kwargs is None:
         backend_kwargs = dict()
     mounts = parse_mounts(mounts)
     if use_cache:
         cache_dir = get_cache_dir(cache_dir=cache_dir)
     else:
         cache_dir = None
-    pkg_file_filter = get_file_filter(pkg_file_filter, cache_dir=cache_dir)
+    pkg_file_filter = get_file_filter(pkg_file_filter)
 
     run(
         conda_env=conda_env,

pyjs_code_runner/constants.py

@@ -1,13 +1,7 @@
 from pathlib import Path
 import os
 
-EXPORT_NAME_SUFFIX = "EmscriptenForgeModule"
 EMSCRIPTEN_HOME = "/home/web_user"
-EMPACK_FILE_FILTER_URL = (
-    "https://raw.githubusercontent.com/emscripten-forge/recipes/main/empack_config.yaml"
-)
-
-
 _THIS_DIR = Path(os.path.dirname(os.path.realpath(__file__)))
 
 JS_DIR = _THIS_DIR / "js"

pyjs_code_runner/get_cache_dir.py

@@ -1,17 +1,16 @@
-from appdirs import user_data_dir
 import appdirs
+
 from pathlib import Path
 
-def get_appdir():
 
+def get_appdir():
     path = Path(appdirs.user_data_dir("pyjs_code_runner", "ThorstenBeier"))
     path.mkdir(parents=True, exist_ok=True)
     return path
 
 
-
 def get_cache_dir(cache_dir=None):
     if cache_dir is None:
         return get_appdir()
     else:
-        return Path(cache_dir)
+        return Path(cache_dir)

pyjs_code_runner/get_file_filter.py

@@ -1,11 +1,7 @@
-import urllib.request
-from pathlib import Path
 from empack.file_patterns import pkg_file_filter_from_yaml
 
-from .constants import EMPACK_FILE_FILTER_URL
 
-
-def get_file_filter(pkg_file_filter, cache_dir):
+def get_file_filter(pkg_file_filter):
     if pkg_file_filter is None or len(pkg_file_filter) == 0:
         return None
     else:

pyjs_code_runner/js_global_object.py

@@ -1,6 +1,4 @@
 from .backend.backend import BackendType, get_backend_type_family, get_backend_cls
-from .constants import EXPORT_NAME_SUFFIX
-from .js_global_object import js_global_object
 from .work_dir_context import work_dir_context
 from .get_cache_dir import get_cache_dir
 
@@ -14,17 +12,21 @@
 import os
 import shutil
 import json
-import sys
-
-def pack_mounts(mounts, host_work_dir, backend_type):
 
 
+def pack_mounts(mounts, host_work_dir, backend_type):
     mount_js_files = []
     for mount_index, (host_path, em_path) in enumerate(mounts):
         mount_filename = f"mount_{mount_index}.tar.gz"
         mount_js_files.append(mount_filename)
         if host_path.is_dir():
-            pack_directory(host_dir=host_path,mount_dir=em_path,outname=mount_filename,outdir=host_work_dir, compresslevel=1)
+            pack_directory(
+                host_dir=host_path,
+                mount_dir=em_path,
+                outname=mount_filename,
+                outdir=host_work_dir,
+                compresslevel=1,
+            )
 
         elif host_path.is_file():
             raise RuntimeError("packing files is not yet supported")
@@ -36,7 +38,6 @@ def pack_mounts(mounts, host_work_dir, backend_type):
         json.dump(mount_js_files, f, indent=4)
 
 
-
 def conda_env_to_cache_name(conda_env, backend_type):
     env_name = str(conda_env).replace(os.path.sep, "_")
     folder_name = (
@@ -94,7 +95,7 @@ def run(
     relocate_prefix = str(relocate_prefix)
     if host_work_dir is not None:
         host_work_dir = Path(host_work_dir)
-        
+
     if pkg_file_filter is None:
         pkg_file_filter = pkg_file_filter_from_yaml(EMPACK_DEFAULT_CONFIG_PATH)
 
@@ -106,7 +107,6 @@ def run(
 
     # create a temporary host work directory
     with host_work_dir_context(host_work_dir) as host_work_dir:
-
         # copy pyjs-runtime to host-work-dir
         copy_pyjs(
             conda_env=conda_env,
@@ -116,16 +116,18 @@ def run(
         )
 
         # pack the environment itself
-        pack_env(env_prefix=conda_env,
-                   relocate_prefix=relocate_prefix,
-                   file_filters=pkg_file_filter,
-                   use_cache=use_cache,
-                   cache_dir=cache_dir,
-                   outdir=host_work_dir,
-                   compresslevel=9)
+        pack_env(
+            env_prefix=conda_env,
+            relocate_prefix=relocate_prefix,
+            file_filters=pkg_file_filter,
+            use_cache=use_cache,
+            cache_dir=cache_dir,
+            outdir=host_work_dir,
+            compresslevel=9,
+        )
 
         # pack all the mounts
-        mount_js_files = pack_mounts(
+        pack_mounts(
             mounts=mounts,
             backend_type=backend_type,
             host_work_dir=host_work_dir,
@@ -142,4 +144,3 @@ def run(
 
         # run
         backend.run()
-