fastled 1.2.12__tar.gz → 1.2.14__tar.gz

{fastled-1.2.12 → fastled-1.2.14}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.2.12
+Version: 1.2.14
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
 License: BSD 3-Clause License
 Keywords: template-python-cmd
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: docker>=7.1.0
@@ -19,7 +19,7 @@ Requires-Dist: disklru>=2.0.1
 Requires-Dist: appdirs>=1.4.4
 Requires-Dist: rapidfuzz>=3.10.1
 Requires-Dist: progress>=1.6
-Requires-Dist: nodejs-bin[cmd]
+Requires-Dist: static-npm>=1.0.6
 
 # FastLED Wasm compiler
 
@@ -54,6 +54,17 @@ In every conceivable way, the local compiler will be much faster than the web ve
 
 https://zackees.github.io/fastled-wasm/
 
+# Install
+
+`pip install fastled`
+
+# Run
+
+```bash
+cd mysketchdirectory
+fastled
+```
+
 # Tutorial video
 
 **Note this video is a little outdated, you will install the app now with `pip install fastled` and run it like `fastled mysketchfolder`**
@@ -271,9 +282,9 @@ A: `delay()` will block `loop()` which blocks the main thread of the browser. Th
 Q: How can I get the compiled size of my FastLED sketch smaller?
 A: A big chunk of space is being used by unnecessary javascript `emscripten` bundling. The wasm_compiler_settings.py file in the FastLED repo can tweak this.
 
-
 # Revisions
 
+  * 1.2.13 - More fixes for npm live-server, now uses `static-npm` to launch it.
   * 1.2.12 - Fixes for python npm for launching live-server
   * 1.2.10 - `fastled.Test` now allows you to spawn the http webserver on a folder with an index.html in it.
   * 1.2.7 - A bunch of fixes for MacOS and probably linux.

{fastled-1.2.12 → fastled-1.2.14}/README.md

@@ -31,6 +31,17 @@ In every conceivable way, the local compiler will be much faster than the web ve
 
 https://zackees.github.io/fastled-wasm/
 
+# Install
+
+`pip install fastled`
+
+# Run
+
+```bash
+cd mysketchdirectory
+fastled
+```
+
 # Tutorial video
 
 **Note this video is a little outdated, you will install the app now with `pip install fastled` and run it like `fastled mysketchfolder`**
@@ -248,9 +259,9 @@ A: `delay()` will block `loop()` which blocks the main thread of the browser. Th
 Q: How can I get the compiled size of my FastLED sketch smaller?
 A: A big chunk of space is being used by unnecessary javascript `emscripten` bundling. The wasm_compiler_settings.py file in the FastLED repo can tweak this.
 
-
 # Revisions
 
+  * 1.2.13 - More fixes for npm live-server, now uses `static-npm` to launch it.
   * 1.2.12 - Fixes for python npm for launching live-server
   * 1.2.10 - `fastled.Test` now allows you to spawn the http webserver on a folder with an index.html in it.
   * 1.2.7 - A bunch of fixes for MacOS and probably linux.

{fastled-1.2.12 → fastled-1.2.14}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "fastled"
 readme = "README.md"
 description = "FastLED Wasm Compiler"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 keywords = ["template-python-cmd"]
 license = { text = "BSD 3-Clause License" }
 classifiers = ["Programming Language :: Python :: 3"]
@@ -20,7 +20,7 @@ dependencies = [
     "appdirs>=1.4.4",
     "rapidfuzz>=3.10.1",
     "progress>=1.6",
-    "nodejs-bin[cmd]",
+    "static-npm>=1.0.6",
 ]
 
 dynamic = ["version"]

{fastled-1.2.12 → fastled-1.2.14}/src/fastled/__init__.py

@@ -14,7 +14,7 @@ from .types import BuildMode, CompileResult, CompileServerError
 # IMPORTANT! There's a bug in github which will REJECT any version update
 # that has any other change in the repo. Please bump the version as the
 # ONLY change in a commit, or else the pypi update and the release will fail.
-__version__ = "1.2.12"
+__version__ = "1.2.14"
 
 
 class Api:

{fastled-1.2.12 → fastled-1.2.14}/src/fastled/open_browser.py

@@ -1,30 +1,58 @@
 import shutil
 import socket
 import subprocess
-import sys
 from multiprocessing import Process
 from pathlib import Path
 
+from static_npm import Npm, Npx
+from static_npm.paths import CACHE_DIR
+from static_npm.running_process import RunningProcess
+
 DEFAULT_PORT = 8081
 
 
 def open_http_server(
     fastled_js: Path, port: int | None = None, open_browser=True
-) -> subprocess.Popen:
+) -> subprocess.Popen | RunningProcess:
     """Start livereload server in the fastled_js directory using API"""
     cmd_list: list[str]
     print(f"\nStarting livereload server in {fastled_js}")
-    if shutil.which("live-server") is None:
-        print("live-server not found. Installing it with the embedded npm...")
-        cmd_list = [sys.executable, "-m", "nodejs.npm", "install", "-g", "live-server"]
-        subprocess.run(cmd_list)
+
     cmd_list = ["live-server"]
     if port is not None:
         cmd_list.extend([f"--port={port}"])
     if not open_browser:
         cmd_list.append("--no-browser")
-    # subprocess.run(["cd", str(fastled_js), "&&"] + cmd_list)
-    return subprocess.Popen(cmd_list, cwd=str(fastled_js), shell=True)
+
+    live_server_where = shutil.which("live-server")
+    if live_server_where is None:
+        print("live-server not found. Installing it with the embedded npm...")
+        # cmd_list = [sys.executable, "-m", "nodejs.npm", "install", "-g", "live-server"]
+        # npm.call("install -g live-server --force --legacy-peer-deps")
+        tool_dir = CACHE_DIR / "live-server"
+        tool_dir.mkdir(parents=True, exist_ok=True)
+        npm = Npm()
+        npx = Npx()
+        npm.run(["install", "live-server", "--prefix", tool_dir])
+        # npm.run(["install", "live-server", "--prefix", str(tool_dir)])
+        cmd_str = subprocess.list2cmdline(
+            ["npx"] + ["--prefix", str(tool_dir)] + cmd_list
+        )
+        print(f"Running: {cmd_str}")
+        proc = npx.run(["--prefix", str(tool_dir)] + cmd_list, cwd=fastled_js)
+        return proc  # type ignore
+    else:
+        # npx.run("live-server", check=False)
+        # subprocess.run(cmd_list)
+        live_server_where = shutil.which("live-server")
+        print(f"Using live-server from {live_server_where}")
+        cmd_list = ["live-server"]
+        if port is not None:
+            cmd_list.extend([f"--port={port}"])
+        if not open_browser:
+            cmd_list.append("--no-browser")
+        # subprocess.run(["cd", str(fastled_js), "&&"] + cmd_list)
+        return subprocess.Popen(cmd_list, cwd=str(fastled_js), shell=True)
 
 
 def _open_browser_python(fastled_js: Path) -> None:

{fastled-1.2.12 → fastled-1.2.14}/src/fastled/site/build.py

@@ -71,7 +71,7 @@ body {
     position: fixed;
     left: var(--spacing-md);
     top: var(--spacing-md);
-    padding: var(--spacing-sm) var(--spacing-lg);
+    padding: 15px 30px;
     z-index: 1001;
     background-color: var(--color-surface);
     border-radius: var(--border-radius);
@@ -80,7 +80,7 @@ body {
     justify-content: center;
     cursor: pointer;
     color: var(--color-text);
-    font-size: 16px;
+    font-size: 24px;
     transition: background-color var(--transition-speed) ease;
 }
 
@@ -88,6 +88,15 @@ body {
     background-color: var(--color-surface-transparent);
 }
 
+.nav-trigger .fa-chevron-down {
+    margin-left: 10px;
+    transition: transform var(--transition-speed) ease;
+}
+
+.nav-pane.visible + .nav-trigger .fa-chevron-down {
+    transform: rotate(180deg);
+}
+
 .nav-pane {
     position: fixed;
     left: var(--spacing-md);
@@ -176,7 +185,7 @@ INDEX_TEMPLATE = """<!DOCTYPE html>
         <div class="splash-text">FastLED</div>
     </div>
     <div class="content-wrapper">
-        <div class="nav-trigger">Examples</div>
+        <div class="nav-trigger">Examples <i class="fas fa-chevron-down"></i></div>
         <nav class="nav-pane">
             {example_links}
         </nav>

{fastled-1.2.12 → fastled-1.2.14}/src/fastled.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: fastled
-Version: 1.2.12
+Version: 1.2.14
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
 License: BSD 3-Clause License
 Keywords: template-python-cmd
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: docker>=7.1.0
@@ -19,7 +19,7 @@ Requires-Dist: disklru>=2.0.1
 Requires-Dist: appdirs>=1.4.4
 Requires-Dist: rapidfuzz>=3.10.1
 Requires-Dist: progress>=1.6
-Requires-Dist: nodejs-bin[cmd]
+Requires-Dist: static-npm>=1.0.6
 
 # FastLED Wasm compiler
 
@@ -54,6 +54,17 @@ In every conceivable way, the local compiler will be much faster than the web ve
 
 https://zackees.github.io/fastled-wasm/
 
+# Install
+
+`pip install fastled`
+
+# Run
+
+```bash
+cd mysketchdirectory
+fastled
+```
+
 # Tutorial video
 
 **Note this video is a little outdated, you will install the app now with `pip install fastled` and run it like `fastled mysketchfolder`**
@@ -271,9 +282,9 @@ A: `delay()` will block `loop()` which blocks the main thread of the browser. Th
 Q: How can I get the compiled size of my FastLED sketch smaller?
 A: A big chunk of space is being used by unnecessary javascript `emscripten` bundling. The wasm_compiler_settings.py file in the FastLED repo can tweak this.
 
-
 # Revisions
 
+  * 1.2.13 - More fixes for npm live-server, now uses `static-npm` to launch it.
   * 1.2.12 - Fixes for python npm for launching live-server
   * 1.2.10 - `fastled.Test` now allows you to spawn the http webserver on a folder with an index.html in it.
   * 1.2.7 - A bunch of fixes for MacOS and probably linux.

{fastled-1.2.12 → fastled-1.2.14}/src/fastled.egg-info/SOURCES.txt

@@ -69,6 +69,7 @@ tests/test_docker_linux_on_windows.py
 tests/test_embedded_data.py
 tests/test_examples.py
 tests/test_filechanger.py
+tests/test_http_server.py
 tests/test_project_init.py
 tests/test_server_and_client_seperatly.py
 tests/test_webcompile.py

{fastled-1.2.12 → fastled-1.2.14}/src/fastled.egg-info/requires.txt

@@ -7,4 +7,4 @@ disklru>=2.0.1
 appdirs>=1.4.4
 rapidfuzz>=3.10.1
 progress>=1.6
-nodejs-bin[cmd]
+static-npm>=1.0.6

{fastled-1.2.12 → fastled-1.2.14}/tests/test_api.py

@@ -4,14 +4,11 @@ Unit test file.
 
 import os
 import platform
-import time
 import unittest
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-import httpx
-
-from fastled import Api, CompileServer, LiveClient, Test
+from fastled import Api, CompileServer, LiveClient
 
 HERE = Path(__file__).parent
 INDEX_HTML = HERE / "html" / "index.html"
@@ -66,16 +63,6 @@ class ApiTester(unittest.TestCase):
             # now test that fastled_js is in the sketch directory
             self.assertTrue(expected_output_dir.exists())
 
-    def test_http_server(self) -> None:
-        """Test the http server."""
-        proc = Test.spawn_http_server(INDEX_HTML.parent, port=8081, open_browser=False)
-        time.sleep(1)
-        # test get request
-        response = httpx.get("http://localhost:8081")
-        self.assertEqual(response.status_code, 200)
-        proc.kill()
-        proc.wait()
-
 
 if __name__ == "__main__":
     unittest.main()

fastled-1.2.14/tests/test_http_server.py

@@ -0,0 +1,49 @@
+"""
+Unit test file.
+"""
+
+import time
+import unittest
+from pathlib import Path
+
+import httpx
+
+from fastled import Test
+
+HERE = Path(__file__).parent
+INDEX_HTML = HERE / "html" / "index.html"
+TIMEOUT = 120
+
+assert INDEX_HTML.exists()
+
+# def override(url) -> None:
+#     """Override the server url."""
+#     assert isinstance(url, str) and "localhost" in url
+
+# client_server.TEST_BEFORE_COMPILE = override
+
+
+class HttpServerTester(unittest.TestCase):
+    """Main tester class."""
+
+    def test_http_server(self) -> None:
+        """Test the http server."""
+        proc = Test.spawn_http_server(INDEX_HTML.parent, port=8081, open_browser=False)
+        time.sleep(1)
+        future_time = time.time() + TIMEOUT
+        while future_time > time.time():
+            try:
+                response = httpx.get("http://localhost:8081", timeout=1)
+                break
+            except Exception:
+                continue
+        else:
+            self.fail("Could not connect to server")
+        response = httpx.get("http://localhost:8081", timeout=5)
+        self.assertEqual(response.status_code, 200)
+        proc.kill()
+        proc.wait()
+
+
+if __name__ == "__main__":
+    unittest.main()