fix docs build - already installed packages not skipped

Author: rmorshea

docs/Dockerfile

@@ -23,7 +23,7 @@ ADD MANIFEST.in ./
 ADD README.md ./
 
 RUN pip install -e .[all]
-RUN python -m idom client install victory semantic-ui-react @material-ui/core
+RUN python -m idom install htm victory semantic-ui-react @material-ui/core
 
 # Build the Docs
 # --------------

docs/source/examples.rst

@@ -57,7 +57,7 @@ Simply install your javascript library of choice using the ``idom`` CLI:
 
 .. code-block:: bash
 
-    idom client install victory
+    idom install victory
 
 Then import the module with :class:`~idom.widgets.utils.Module`:
 

docs/source/javascript-components.rst

@@ -38,7 +38,7 @@ using the ``idom`` CLI:
 
 .. code-block:: bash
 
-    idom client install @material-ui/core
+    idom install @material-ui/core
 
 Or at runtime with :func:`idom.client.module.install` (this is useful if you're working
 in a REPL or Jupyter Notebook):

noxfile.py

@@ -148,4 +148,4 @@ def test_docs(session: Session) -> None:
 def install_idom_dev(session: Session, extras: str = "stable") -> None:
     session.install("-e", f".[{extras}]")
     if "--no-restore" not in session.posargs:
-        session.run("idom", "client", "restore")
+        session.run("idom", "restore")

src/idom/cli.py

@@ -1,38 +1,42 @@
+from logging.config import dictConfig
 from typing import List
 
 import typer
 from rich.console import Console
 from rich.table import Table
 
 import idom
+from idom.client import _private
 from idom.client import manage as manage_client
 
+from .log import logging_config_defaults
+
 
 main = typer.Typer()
 console = Console()
 
-# --- Subcommands ---
-client = typer.Typer(name="client", short_help="Manage IDOM's built-in client")
-show = typer.Typer(name="show", short_help="Display information about IDOM")
-main.add_typer(client)
-main.add_typer(show)
+
+@main.callback()
+def init() -> None:
+    # reset logging config after Typer() has wrapped stdout
+    dictConfig(logging_config_defaults())
 
 
-@client.command()
+@main.command()
 def install(packages: List[str]) -> None:
     """Install a Javascript package from NPM into the client"""
     manage_client.build(packages, clean_build=False)
     return None
 
 
-@client.command()
+@main.command()
 def restore() -> None:
     """Return to a fresh install of Ithe client"""
     manage_client.restore()
     return None
 
 
-@show.command()
+@main.command()
 def version(verbose: bool = False) -> None:
     """Show version information"""
     if not verbose:
@@ -46,7 +50,7 @@ def version(verbose: bool = False) -> None:
 
         table.add_row("idom", str(idom.__version__), "Python")
 
-        for js_pkg, js_ver in manage_client.dependency_versions().items():
+        for js_pkg, js_ver in _private.build_dependencies().items():
             table.add_row(js_pkg, js_ver, "Javascript")
 
         console.print(table)

src/idom/client/_private.py

@@ -1,14 +1,13 @@
+import json
 import re
 import shutil
 from pathlib import Path
-from typing import List, Tuple
+from typing import Dict, List, Tuple, cast
 
 from idom.config import IDOM_CLIENT_BUILD_DIR
 
 
 HERE = Path(__file__).parent
-
-
 APP_DIR = HERE / "app"
 BACKUP_BUILD_DIR = APP_DIR / "build"
 
@@ -58,6 +57,11 @@ def split_package_name_and_version(pkg: str) -> Tuple[str, str]:
         return pkg, ""
 
 
+def build_dependencies() -> Dict[str, str]:
+    package_json = build_dir() / "package.json"
+    return cast(Dict[str, str], json.loads(package_json.read_text())["dependencies"])
+
+
 _JS_MODULE_EXPORT_PATTERN = re.compile(
     r";?\s*export\s*{([0-9a-zA-Z_$\s,]*)}\s*;", re.MULTILINE
 )