Get the black and mypy fixes cleaned up. Re-organize fixtures to better mimic Element.

Author: pauleveritt

TODO.md

@@ -8,6 +8,10 @@
 
 - Start documentation for example writers
   - Explain that we own the `src` in `py-config`
+- Remove the hack in noxfile to have tests only run the "fast" ones
+  - Playright files get the example index.html directly
+  - And thus, don't have the py-config src re-pointed to cdn
+  - When run in nox, there are no local files and need to do CDN
 
 ## Eventually
 

docs/developers/cdn_mode.md

@@ -90,4 +90,4 @@ The `py_config.cdn.toml` file points at the CDN version.
 
 - Remove the timeout
 - Test/implementation that calls a `is_local` function to detect the correct mode
-- Test/implementation which wires that into the HTML munger
+- Test/implementation which wires that into the HTML munger

noxfile.py

@@ -176,7 +176,16 @@ def tests(session: Session) -> None:
         "python-frontmatter",
     )
     try:
-        session.run("coverage", "run", "--parallel", "-m", "pytest", *session.posargs)
+        session.run(
+            "coverage",
+            "run",
+            "--parallel",
+            "-m",
+            "pytest",
+            "-m",
+            "not full",
+            *session.posargs,
+        )
     finally:
         if session.interactive:
             session.notify("coverage", posargs=[])

src/psc/app.py

@@ -107,9 +107,10 @@ async def content_page(request: Request) -> _TemplateResponse:
     Route("/pages/{page_name}.html", content_page),
     Mount("/gallery", StaticFiles(directory=HERE / "gallery")),
     Mount("/static", StaticFiles(directory=HERE / "static")),
+]
+if PYODIDE.exists():
     Mount("/pyscript", StaticFiles(directory=PYSCRIPT)),
     Mount("/pyodide", StaticFiles(directory=PYODIDE)),
-]
 
 
 @contextlib.asynccontextmanager  # type: ignore

src/psc/fixtures.py

@@ -188,6 +188,7 @@ class FakeDocument:
 
     values: dict[str, str] = field(default_factory=dict)
     log: list[str] = field(default_factory=list)
+    nodes: dict[str, FakeElement] = field(default_factory=dict)
 
 
 @pytest.fixture
@@ -197,39 +198,57 @@ def fake_document() -> Iterable[FakeDocument]:
 
 
 @dataclass
-class ElementNode:
-    """An element node."""
+class FakeElementNode:
+    """Fake for PyScript's ``element`` accessor that gets DOM node."""
+
+    log: list[str] = field(default_factory=list)
+
+    def removeAttribute(self, name: str) -> None:  # noqa
+        """Pretend to remove an attribute from this node."""
+        self.log.append(f"Removed {name}")
+
+
+@dataclass
+class FakeElement:
+    """A fake for PyScript's Element global."""
 
     value: str
     document: FakeDocument
+    element: FakeElementNode = FakeElementNode()
 
     def write(self, value: str) -> None:
         """Collect anything that is written to the node."""
         self.document.log.append(value)
 
-    def removeAttribute(self, name: str) -> None:  # noqa
-        """Pretend to remove an attribute from this node."""
-        pass
-
 
 @dataclass
 class ElementCallable:
-    """A callable that returns an ElementNode."""
+    """A callable that registers and returns an ElementNode."""
 
     document: FakeDocument
 
-    def __call__(self, key: str) -> ElementNode:
+    def __call__(self, key: str) -> FakeElement:
         """Return an ElementNode."""
         value = self.document.values[key]
-        node = ElementNode(value, self.document)
+        node = FakeElement(value, self.document)
+        self.document.nodes[key] = node
         return node
 
+    def removeAttribute(self, attr: str) -> None:  # noqa: N802
+        """Fake the remove attribute call."""
+        pass
+
+    def write(self, content: str) -> None:
+        """Fake the write call."""
+        pass
+
 
 @pytest.fixture
-def fake_element(fake_document: FakeDocument) -> None: # type: ignore [misc]
+def fake_element(fake_document: FakeDocument) -> ElementCallable:  # type: ignore [misc]
     """Install the stateful Element into builtins."""
     try:
-        builtins.Element = ElementCallable(fake_document) #type: ignore [attr-defined]
-        yield
+        this_element = ElementCallable(fake_document)
+        builtins.Element = this_element  # type: ignore [attr-defined]
+        yield this_element
     finally:
         delattr(builtins, "Element")

src/psc/gallery/examples/altair/index.html

@@ -6,7 +6,7 @@
     <script defer src="../../../pyscript/pyscript.js"></script>
 </head>
 <body>
-<py-config src="../py_config.toml">
+<py-config src="../py_config.local.toml">
     packages=[
     "altair",
     "pandas",

src/psc/gallery/examples/antigravity/index.html

@@ -6,7 +6,7 @@
     <script defer src="../../../pyscript/pyscript.js"></script>
 </head>
 <body>
-<py-config src="../py_config.toml">
+<py-config src="../py_config.local.toml">
     paths = ["./antigravity.py"]
 </py-config>
 <strong>Based on xkcd: antigravity https://xkcd.com/353/.</strong>

src/psc/gallery/examples/hello_world/index.html

@@ -7,7 +7,7 @@
     <link rel="stylesheet" href="hello_world.css">
 </head>
 <body>
-<py-config src="../py_config.toml"></py-config>
+<py-config src="../py_config.local.toml"></py-config>
 <h1>Hello ...</h1>
 <div id="output"></div>
 <h6>More Info</h6>

src/psc/gallery/examples/hello_world_py/hello_world.py

@@ -1,3 +1,3 @@
 """Say Hello."""
-output = Element("output") #type: ignore
+output = Element("output")  # type: ignore
 output.write("From Python...")

src/psc/gallery/examples/interest_calculator/calculator.py

@@ -1,3 +1,6 @@
+"""Calculate the interest."""
+
+
 def interest(*args, **kwargs):
     """Main interest calculation function."""
     # Signal that PyScript is alive by setting the ``Calculate``