From 748abb0e46d57a444bb82607652e5eb8863de493 Mon Sep 17 00:00:00 2001 From: Luis-Hebendanz Date: Sun, 12 Nov 2023 18:23:05 +0100 Subject: [PATCH 1/4] Added sqlalchemy dependency --- pkgs/clan-cli/clan_cli/webui/routers/health.py | 2 +- pkgs/clan-cli/default.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/clan-cli/clan_cli/webui/routers/health.py b/pkgs/clan-cli/clan_cli/webui/routers/health.py index 5c521f5..24967e5 100644 --- a/pkgs/clan-cli/clan_cli/webui/routers/health.py +++ b/pkgs/clan-cli/clan_cli/webui/routers/health.py @@ -3,6 +3,6 @@ from fastapi import APIRouter router = APIRouter() -@router.get("/health", include_in_schema=False) +@router.get("/health", include_in_schema=True) async def health() -> str: return "OK" diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix index 4a087e8..3f66053 100644 --- a/pkgs/clan-cli/default.nix +++ b/pkgs/clan-cli/default.nix @@ -34,6 +34,7 @@ , gnupg , e2fsprogs , mypy +, sqlalchemy }: let @@ -41,6 +42,7 @@ let argcomplete # optional dependency: if not enabled, shell completion will not work fastapi uvicorn # optional dependencies: if not enabled, webui subcommand will not work + sqlalchemy ]; pytestDependencies = runtimeDependencies ++ dependencies ++ [ -- 2.51.0 From 476a484e189fa93c36b5351307ceb0a0a1078135 Mon Sep 17 00:00:00 2001 From: Luis-Hebendanz Date: Sun, 12 Nov 2023 18:24:23 +0100 Subject: [PATCH 2/4] nix fmt --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a07da0d..ba0a1ec 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ Welcome to our website template repository! This template is designed to help yo **Dependency Management**: We use the [Nix package manager](https://nixos.org/) to manage dependencies and ensure reproducibility, making your development process more robust. ## Supported Operating Systems + - Linux - macOS @@ -33,8 +34,10 @@ Let's get your development environment up and running: ``` 3. **Add direnv to your shell**: + - Direnv needs to [hook into your shell](https://direnv.net/docs/hook.html) to work. - You can do this by executing following command: + You can do this by executing following command: + ```bash echo 'eval "$(direnv hook zsh)"' >> ~/.zshrc && echo 'eval "$(direnv hook bash)"' >> ~/.bashrc && eval "$SHELL" ``` -- 2.51.0 From 7f833081776527889c6008e9f7b27f2eb389580b Mon Sep 17 00:00:00 2001 From: Luis-Hebendanz Date: Sun, 12 Nov 2023 18:31:45 +0100 Subject: [PATCH 3/4] Improved Documentation --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ba0a1ec..ea62991 100644 --- a/README.md +++ b/README.md @@ -122,6 +122,8 @@ Let's set up your Git workflow to collaborate effectively: ```bash merge-after-ci ``` + - If it fails and says something along the lines off `[ERROR] fail-on-change` then the formatter complained. + Execute `nix fmt` from the project root by hand and then make a new git commit. Afterwards redo step 3 and it should work. 4. **Review Your Pull Request**: -- 2.51.0 From 485b0f61bf3167cc0c93c10a53687c265b5e854c Mon Sep 17 00:00:00 2001 From: Luis-Hebendanz Date: Sun, 12 Nov 2023 18:35:54 +0100 Subject: [PATCH 4/4] Added websocket dependency --- pkgs/clan-cli/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix index 3f66053..a9f4b66 100644 --- a/pkgs/clan-cli/default.nix +++ b/pkgs/clan-cli/default.nix @@ -35,6 +35,7 @@ , e2fsprogs , mypy , sqlalchemy +, websockets }: let @@ -43,6 +44,7 @@ let fastapi uvicorn # optional dependencies: if not enabled, webui subcommand will not work sqlalchemy + websockets ]; pytestDependencies = runtimeDependencies ++ dependencies ++ [ -- 2.51.0