fastled 1.2.36__tar.gz → 1.2.39__tar.gz

{fastled-1.2.36 → fastled-1.2.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.36
+Version: 1.2.39
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -211,7 +211,7 @@ with Api.server() as server:
 **Build Docker Image from a local copy of the FastLED repo**
 ```python
 from fastapi import Docker, Api
-container_name: str = Docker.build_from_fastled_repo()
+container_name: str = Docker.spawn_server_from_fastled_repo()
 with Api.server(container_name=container_name) as server:
   ...
 ```

{fastled-1.2.36 → fastled-1.2.39}/README.md

@@ -185,7 +185,7 @@ with Api.server() as server:
 **Build Docker Image from a local copy of the FastLED repo**
 ```python
 from fastapi import Docker, Api
-container_name: str = Docker.build_from_fastled_repo()
+container_name: str = Docker.spawn_server_from_fastled_repo()
 with Api.server(container_name=container_name) as server:
   ...
 ```

{fastled-1.2.36 → fastled-1.2.39}/src/fastled/__init__.py

@@ -16,7 +16,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.36"
+__version__ = "1.2.39"
 
 
 class Api:
@@ -157,10 +157,10 @@ class Docker:
         docker_mgr.purge(image_name=IMAGE_NAME)
 
     @staticmethod
-    def build_from_github(
+    def spawn_server_from_github(
         url: str = "https://github.com/fastled/fastled",
         output_dir: Path | str = Path(".cache/fastled"),
-    ) -> str:
+    ) -> CompileServer:
         """Build the FastLED WASM compiler Docker image from a GitHub repository.
 
         Args:
@@ -252,21 +252,32 @@ class Docker:
             platform_tag=platform_tag,
         )
 
-        # Run the container and return it
-        container = docker_mgr.run_container_detached(
-            image_name=IMAGE_NAME,
-            tag="main",
+        # # Run the container and return it
+        # container = docker_mgr.run_container_detached(
+        #     image_name=IMAGE_NAME,
+        #     tag="main",
+        #     container_name=CONTAINER_NAME,
+        #     command=None,  # Use default command from Dockerfile
+        #     volumes=None,  # No volumes needed for build
+        #     ports=None,  # No ports needed for build
+        #     remove_previous=True,  # Remove any existing container
+        # )
+        # name = container.name
+        # container.stop()
+
+        out: CompileServer = CompileServer(
             container_name=CONTAINER_NAME,
-            command=None,  # Use default command from Dockerfile
-            volumes=None,  # No volumes needed for build
-            ports=None,  # No ports needed for build
-            remove_previous=True,  # Remove any existing container
+            interactive=False,
+            auto_updates=False,
+            mapped_dir=None,
+            auto_start=True,
+            remove_previous=True,
         )
 
-        return container.name  # Todo, create an external docker container api.
+        return out
 
     @staticmethod
-    def build_from_fastled_repo(
+    def spawn_server_from_fastled_repo(
         project_root: Path | str = Path("."),
         interactive: bool = False,
         sketch_folder: Path | None = None,

{fastled-1.2.36 → fastled-1.2.39}/src/fastled/app.py

@@ -66,7 +66,7 @@ def main() -> int:
             print(f"Building Docker image at {project_root}")
             from fastled import Api, Docker
 
-            server = Docker.build_from_fastled_repo(
+            server = Docker.spawn_server_from_fastled_repo(
                 project_root=project_root, interactive=interactive
             )
             assert isinstance(server, CompileServer)

{fastled-1.2.36 → fastled-1.2.39}/src/fastled/compile_server_impl.py

@@ -13,6 +13,7 @@ from fastled.docker_manager import (
     DockerManager,
     RunningContainer,
 )
+from fastled.interactive_srcs import INTERACTIVE_SOURCES
 from fastled.settings import DEFAULT_CONTAINER_NAME, IMAGE_NAME, SERVER_PORT
 from fastled.sketch import looks_like_fastled_repo
 from fastled.types import BuildMode, CompileResult, CompileServerError
@@ -221,10 +222,7 @@ class CompileServerImpl:
             if self.fastled_src_dir is not None:
                 # add volume for src/platforms/wasm/compiler/CMakelists.txt
                 # to allow for interactive compilation
-                interactive_sources = [
-                    "src/platforms/wasm/compiler/CMakeLists.txt",
-                    "src/platforms/wasm/compiler/build_archive.sh",
-                ]
+                interactive_sources = list(INTERACTIVE_SOURCES)
                 for src in interactive_sources:
                     src_path = Path(src).absolute()
                     if src_path.exists():

fastled-1.2.39/src/fastled/interactive_srcs.py

@@ -0,0 +1,5 @@
+INTERACTIVE_SOURCES: list[str] = [
+    "src/platforms/wasm/compiler/CMakeLists.txt",
+    "src/platforms/wasm/compiler/build_archive.sh",
+    "src/platforms/wasm/compiler/build.sh",
+]

{fastled-1.2.36 → fastled-1.2.39}/src/fastled.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fastled
-Version: 1.2.36
+Version: 1.2.39
 Summary: FastLED Wasm Compiler
 Home-page: https://github.com/zackees/fastled-wasm
 Maintainer: Zachary Vorhies
@@ -211,7 +211,7 @@ with Api.server() as server:
 **Build Docker Image from a local copy of the FastLED repo**
 ```python
 from fastapi import Docker, Api
-container_name: str = Docker.build_from_fastled_repo()
+container_name: str = Docker.spawn_server_from_fastled_repo()
 with Api.server(container_name=container_name) as server:
   ...
 ```

{fastled-1.2.36 → fastled-1.2.39}/src/fastled.egg-info/SOURCES.txt

@@ -36,6 +36,7 @@ src/fastled/compile_server.py
 src/fastled/compile_server_impl.py
 src/fastled/docker_manager.py
 src/fastled/filewatcher.py
+src/fastled/interactive_srcs.py
 src/fastled/keyboard.py
 src/fastled/live_client.py
 src/fastled/open_browser.py
@@ -63,7 +64,6 @@ src/fastled/test/can_run_local_docker_tests.py
 src/fastled/test/examples.py
 tests/test_api.py
 tests/test_bad_ino.py
-tests/test_build.py
 tests/test_build_examples.py
 tests/test_build_from_docker.py
 tests/test_build_from_github.py

{fastled-1.2.36 → fastled-1.2.39}/tests/test_build_from_docker.py

@@ -34,7 +34,9 @@ class BuildDockerFromRepoTester(unittest.TestCase):
     @unittest.skipUnless(_enabled(), "Skipping test on non-Linux system on github")
     def test_build_docker(self) -> None:
         """Builds the docker file from the fastled repo."""
-        server: CompileServer = Docker.build_from_fastled_repo(FASTLED_SISTER_REPO)
+        server: CompileServer = Docker.spawn_server_from_fastled_repo(
+            FASTLED_SISTER_REPO
+        )
         self.assertIsNotNone(server, "Failed to build docker image")
 
         try:

{fastled-1.2.36 → fastled-1.2.39}/tests/test_build_from_github.py

@@ -5,7 +5,7 @@ Unit test file.
 import unittest
 from pathlib import Path
 
-from fastled import Api, CompileServer, Docker, Test  # type: ignore
+from fastled import CompileServer, Docker, Test  # type: ignore
 
 HERE = Path(__file__).parent
 PROJECT_ROOT = HERE.parent
@@ -35,11 +35,14 @@ class BuildDockerFromGithubTester(unittest.TestCase):
         """Builds the docker file from the fastled repo."""
         url = DEFAULT_GITHUB_URL
         print("Building from github")
-        docker_image_name = Docker.build_from_github(url=url, output_dir=OUTPUT_DIR)
-        self.assertTrue(docker_image_name, "Failed to build docker image")
-        server: CompileServer
-        with Api.server(auto_updates=True, container_name=docker_image_name) as server:
+        server: CompileServer = Docker.spawn_server_from_github(
+            url=url, output_dir=OUTPUT_DIR
+        )
+        self.assertTrue(server, "Failed to build docker image")
+        try:
             self.assertTrue(server.ping())
+        finally:
+            server.stop()
 
 
 if __name__ == "__main__":

{fastled-1.2.36 → fastled-1.2.39}/tests/test_http_server.py

@@ -2,6 +2,7 @@
 Unit test file.
 """
 
+import random
 import unittest
 from pathlib import Path
 
@@ -16,20 +17,27 @@ TIMEOUT = 120
 assert INDEX_HTML.exists()
 
 
+# realistic range, 8021 - 8030
+PORT = random.randint(8021, 8030)
+PORT2 = PORT + 1
+
+
 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=8021, open_browser=False)
-        response = httpx.get("http://localhost:8021", timeout=1)
+        port = PORT
+        proc = Test.spawn_http_server(INDEX_HTML.parent, port=port, open_browser=False)
+        response = httpx.get(f"http://localhost:{port}", timeout=1)
         self.assertEqual(response.status_code, 200)
         proc.terminate()
 
     def test_http_server_404(self) -> None:
         """Test the http server returns 404 for non-existent files."""
-        proc = Test.spawn_http_server(INDEX_HTML.parent, port=8022, open_browser=False)
-        response = httpx.get("http://localhost:8022/nonexistent.html", timeout=1)
+        port = PORT2
+        proc = Test.spawn_http_server(INDEX_HTML.parent, port=port, open_browser=False)
+        response = httpx.get(f"http://localhost:{port}/nonexistent.html", timeout=1)
         self.assertEqual(response.status_code, 404)
         proc.terminate()
 

fastled-1.2.36/tests/test_build.py

@@ -1,57 +0,0 @@
-"""
-Unit test file.
-"""
-
-import unittest
-from pathlib import Path
-
-from fastled import Api, CompileServer, Docker, Test  # type: ignore
-
-HERE = Path(__file__).parent
-PROJECT_ROOT = HERE.parent
-FASTLED_SISTER_REPO = PROJECT_ROOT / ".." / "FastLED"
-
-DEFAULT_GITHUB_URL = "https://github.com/fastled/fastled"
-OUTPUT_DIR = Path(".cache/fastled")
-
-
-def _enabled() -> bool:
-    """Check if this system can run the tests."""
-    sister_repo_does_not_exist = not FASTLED_SISTER_REPO.exists()
-
-    if sister_repo_does_not_exist:
-        print(
-            f"This test is only enable when FastLED is a repo in the same directly as the project root folder: {FASTLED_SISTER_REPO} does not exist"
-        )
-        return False
-
-    return Test.can_run_local_docker_tests()
-
-
-class BuildDockerFromRepoTester(unittest.TestCase):
-    """Main tester class."""
-
-    @unittest.skipUnless(_enabled(), "Skipping test on non-Linux system on github")
-    def test_build_docker(self) -> None:
-        """Builds the docker file from the fastled repo."""
-
-        container = Docker.build_from_fastled_repo(FASTLED_SISTER_REPO)
-        try:
-            self.assertTrue(container.ping())
-        finally:
-            container.stop()
-
-    @unittest.skipUnless(_enabled(), "Skipping test on non-Linux system on github")
-    def test_build_docker_from_github(self) -> None:
-        """Builds the docker file from the fastled repo."""
-        url = DEFAULT_GITHUB_URL
-        print("Building from github")
-        docker_image_name = Docker.build_from_github(url=url, output_dir=OUTPUT_DIR)
-        self.assertTrue(docker_image_name, "Failed to build docker image")
-        server: CompileServer
-        with Api.server(auto_updates=True, container_name=docker_image_name) as server:
-            self.assertTrue(server.ping())
-
-
-if __name__ == "__main__":
-    unittest.main()