feat(cross): #41 update example

.github/workflows/dev.yml

@@ -89,15 +89,6 @@ jobs:
         with:
           args: sh -c "chown -R root:root /github/workspace && m . /lintGitMailMap"
 
-  lintMarkdown_readme:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
-      - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
-        name: /lintMarkdown/readme
-        with:
-          args: sh -c "chown -R root:root /github/workspace && m . /lintMarkdown/readme"
-
   lintNix:
     runs-on: ubuntu-latest
     steps:

.github/workflows/prod.yml

@@ -104,17 +104,6 @@ jobs:
         env:
           CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
-  lintMarkdown_readme:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@f095bcc56b7c2baf48f3ac70d6d6782f4f553222
-      - uses: docker://ghcr.io/fluidattacks/makes/amd64:latest
-        name: /lintMarkdown/readme
-        with:
-          args: sh -c "chown -R root:root /github/workspace && m . /lintMarkdown/readme"
-        env:
-          CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
-
   lintNix:
     runs-on: ubuntu-latest
     steps:

.mailmap

@@ -1,3 +1,4 @@
+Daniel Betancur <[email protected]> Daniel Betancur <[email protected]>
 Daniel Salazar <[email protected]> Daniel Salazar <[email protected]>
 Daniel Salazar <[email protected]> Daniel Salazar <[email protected]>
 Daniel Salazar <[email protected]> Daniel Salazar <[email protected]>

api/deploy/main.nix

@@ -1,13 +1,7 @@
-{
-  inputs,
-  makeScript,
-  ...
-}:
+{ inputs, makeScript, ... }:
 makeScript {
   name = "api-deploy";
-  replace = {
-    __argApiCompose__ = ./compose.yaml;
-  };
+  replace = { __argApiCompose__ = ./compose.yaml; };
   searchPaths = {
     bin = [
       inputs.nixpkgs.curl

api/env/main.nix

@@ -1,5 +1,5 @@
-{makePythonEnvironment, ...}:
+{ makePythonEnvironment, ... }:
 makePythonEnvironment {
   pythonProjectDir = ./.;
-  pythonVersion = "3.11";
+  pythonVersion = "3.12";
 }

api/env/pyproject.toml

@@ -7,8 +7,8 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.11"
-fastapi = "0.78.0"
-uvicorn = "0.18.2"
+fastapi = "0.115.4"
+uvicorn = "0.32.0"
 
 [build-system]
 requires = ["poetry-core"]

api/main.nix

@@ -1,15 +1,7 @@
-{
-  inputs,
-  makeScript,
-  outputs,
-  projectPath,
-  ...
-}:
+{ inputs, makeScript, outputs, projectPath, ... }:
 makeScript {
-  replace = {
-    __argApiSrc__ = projectPath "/api/src";
-  };
+  replace = { __argApiSrc__ = projectPath "/api/src"; };
   name = "api";
-  searchPaths.source = [outputs."/api/env"];
+  searchPaths.source = [ outputs."/api/env" ];
   entrypoint = ./entrypoint.sh;
 }

api/makes.nix

@@ -1,22 +1,12 @@
-{
-  inputs,
-  outputs,
-  makePythonPyprojectPackage,
-  projectPath,
-  ...
-}: {
+{ inputs, outputs, makePythonPyprojectPackage, projectPath, ... }: {
   lintPython = {
     modules = {
       api = {
-        searchPaths.source = [outputs."/api/env"];
+        searchPaths.source = [ outputs."/api/env" ];
         src = "/api/src";
       };
     };
   };
-  lintWithLizard = {
-    api = ["/api/src"];
-  };
-  securePythonWithBandit = {
-    api.target = "/api/src";
-  };
+  lintWithLizard = { api = [ "/api/src" ]; };
+  securePythonWithBandit = { api.target = "/api/src"; };
 }

api/src/main.py

@@ -11,7 +11,7 @@
 app = FastAPI()
 
 
-class Item(BaseModel):  # pylint: disable=too-few-public-methods
+class Item(BaseModel):
     name: str
     price: float
     is_offer: Union[bool, None] = None

makes.nix

@@ -1,10 +1,11 @@
-{fetchNixpkgs, ...}: {
+{ fetchNixpkgs, ... }: {
   cache = {
     readNixos = true;
     extra = {
       makes = {
         enable = true;
-        pubKey = "makes.cachix.org-1:zO7UjWLTRR8Vfzkgsu1PESjmb6ymy1e4OE9YfMmCQR4=";
+        pubKey =
+          "makes.cachix.org-1:zO7UjWLTRR8Vfzkgsu1PESjmb6ymy1e4OE9YfMmCQR4=";
         token = "CACHIX_AUTH_TOKEN";
         type = "cachix";
         url = "https://makes.cachix.org";
@@ -14,30 +15,24 @@
   };
   formatBash = {
     enable = true;
-    targets = ["/"];
+    targets = [ "/" ];
   };
   formatMarkdown = {
     enable = true;
-    doctocArgs = ["--title" "# Contents"];
-    targets = ["/README.md"];
+    doctocArgs = [ "--title" "# Contents" ];
+    targets = [ "/README.md" ];
   };
   formatNix = {
     enable = true;
-    targets = ["/"];
-  };
-  formatPython = {
-    default = {
-      targets = ["/"];
-    };
+    targets = [ "/" ];
   };
+  formatPython = { default = { targets = [ "/" ]; }; };
   formatYaml = {
     enable = true;
-    targets = ["/"];
+    targets = [ "/" ];
   };
-  extendingMakesDirs = ["/"];
-  imports = [
-    ./api/makes.nix
-  ];
+  extendingMakesDirs = [ "/" ];
+  imports = [ ./api/makes.nix ];
   inputs = {
     nixpkgs = fetchNixpkgs {
       rev = "32c00dc37042934c79041116383e27f04ad84710";
@@ -46,24 +41,16 @@
   };
   lintBash = {
     enable = true;
-    targets = ["/"];
+    targets = [ "/" ];
   };
   lintGitCommitMsg = {
     enable = true;
     config = "/.lint-git-commit-msg/config.js";
     parser = "/.lint-git-commit-msg/parser.js";
   };
-  lintGitMailMap = {
-    enable = true;
-  };
-  lintMarkdown = {
-    readme = {
-      config = "/.lint-markdown/config.rb";
-      targets = ["/"];
-    };
-  };
+  lintGitMailMap = { enable = true; };
   lintNix = {
     enable = true;
-    targets = ["/"];
+    targets = [ "/" ];
   };
 }