minor updates

Author: rmorshea

idom/__main__.py

@@ -1,8 +1,8 @@
+# pragma: no cover
 import sys
 
 from loguru import logger
 
-# pragma: no cover
 from .cli import main
 
 

idom/client/manage.py

@@ -43,7 +43,7 @@ def web_module_names() -> Set[str]:
     }
 
 
-def register_web_module(package_name: str, source: Union[Path, str]) -> str:
+def add_web_module(package_name: str, source: Union[Path, str]) -> str:
     source = Path(source)
     if not source.exists():
         raise FileNotFoundError(f"Package source file does not exist: {str(source)!r}")
@@ -65,7 +65,7 @@ def web_module_path(package_name: str, must_exist: bool = False) -> Path:
 
 
 def restore() -> None:
-    build(clean_build=True)
+    build([], clean_build=True)
 
 
 def build(packages_to_install: Sequence[str], clean_build: bool = False) -> None:

idom/client/module.py

@@ -77,7 +77,7 @@ def __init__(
         self.fallback = fallback
         self.exports: Optional[List[str]] = None
         if source_file is not None:
-            self.url = client.current.register_web_module(url_or_name, source_file)
+            self.url = client.current.add_web_module(url_or_name, source_file)
             if check_exports:
                 self.exports = client.current.web_module_exports(url_or_name)
         elif client.current.web_module_exists(url_or_name):

idom/client/protocol.py

@@ -26,7 +26,7 @@ def web_module_names(self) -> Set[str]:
     def web_module_path(self, package_name: str) -> Path:
         """Return the path to a web module's source"""
 
-    def register_web_module(self, package_name: str, source: Union[Path, str]) -> str:
+    def add_web_module(self, package_name: str, source: Union[Path, str]) -> str:
         """Return the URL of a module added under the given ``name`` and contents of ``source``"""
 
 

tests/conftest.py

@@ -1,7 +1,6 @@
 import logging
 import inspect
 import time
-from copy import deepcopy
 from typing import Callable, Any, Type, Tuple, Iterator, Iterable, Union
 
 import sanic
@@ -17,11 +16,7 @@
 import pyalect.builtins.pytest  # noqa
 
 import idom
-from idom.client.manage import (
-    build_config,
-    build as build_client,
-    restore as restore_client,
-)
+from idom.client import manage as manage_client
 from idom.core import ElementConstructor, AbstractElement
 from idom.server.prefab import hotswap_server, AbstractRenderServer
 from idom.server.utils import find_available_port
@@ -272,31 +267,6 @@ def _clean_last_server_error(last_server_error) -> Iterator[None]:
     yield
 
 
-@pytest.fixture
-def install():
-    def add_dependency(*packages):
-        config = build_config()
-        with config.change_entry("tests") as entry:
-            old_js_deps = entry.setdefault("js_dependencies", [])
-            new_js_deps = set(packages).union(old_js_deps)
-            entry["js_dependencies"] = list(new_js_deps)
-        if old_js_deps != new_js_deps:
-            build_client()
-
-    return add_dependency
-
-
-@pytest.fixture
-def temp_build_config():
-    config = build_config()
-    original_cfgs = [deepcopy(cfg) for cfg in config.data["entries"].values()]
-    try:
-        yield config
-    finally:
-        config.update_entries(original_cfgs)
-        config.save()
-
-
 @pytest.fixture(scope="session", autouse=True)
 def _restore_client(pytestconfig: Config) -> Iterator[None]:
     """Restore the client's state before and after testing
@@ -306,8 +276,8 @@ def _restore_client(pytestconfig: Config) -> Iterator[None]:
     after testing and may effect usage of IDOM beyond the scope of the tests.
     """
     if pytestconfig.option.restore_client:
-        restore_client()
+        manage_client.restore()
         yield
-        restore_client()
+        manage_client.restore()
     else:
         yield

tests/test_client/conftest.py

@@ -5,5 +5,4 @@
 
 @pytest.fixture
 def victory_js(install):
-    install("victory@35.4.0")
-    return idom.Module("victory")
+    return idom.install("victory@35.4.0")