From 7f937077cf02f007daf733c423dd955a8d5e0915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 21 Jul 2023 13:30:35 +0200
Subject: [PATCH 1/2] clan-cli/tests: fixup imports

---
 pkgs/clan-cli/tests/test_clan_admin.py | 6 +++---
 pkgs/clan-cli/tests/test_cli.py        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/clan-cli/tests/test_clan_admin.py b/pkgs/clan-cli/tests/test_clan_admin.py
index a2e35ef..555186c 100644
--- a/pkgs/clan-cli/tests/test_clan_admin.py
+++ b/pkgs/clan-cli/tests/test_clan_admin.py
@@ -1,11 +1,11 @@
 import argparse
 
-import clan_admin
+from clan_cli import admin
 
 
 def test_make_parser():
     parser = argparse.ArgumentParser()
-    clan_admin.make_parser(parser)
+    admin.register_parser(parser)
 
 
 # using fp fixture from pytest-subprocess
@@ -13,5 +13,5 @@ def test_create(fp):
     cmd = ["nix", "flake", "init", "-t", fp.any()]
     fp.register(cmd)
     args = argparse.Namespace(folder="./my-clan")
-    clan_admin.create(args)
+    admin.create(args)
     assert fp.call_count(cmd) == 1
diff --git a/pkgs/clan-cli/tests/test_cli.py b/pkgs/clan-cli/tests/test_cli.py
index d9213dc..993e4b9 100644
--- a/pkgs/clan-cli/tests/test_cli.py
+++ b/pkgs/clan-cli/tests/test_cli.py
@@ -1,11 +1,11 @@
 import sys
 
-import clan
+import clan_cli
 import pytest
 
 
 def test_no_args(capsys):
-    clan.clan()
+    clan_cli.main()
     captured = capsys.readouterr()
     assert captured.out.startswith("usage:")
 
@@ -13,6 +13,6 @@ def test_no_args(capsys):
 def test_help(capsys, monkeypatch):
     monkeypatch.setattr(sys, "argv", ["", "--help"])
     with pytest.raises(SystemExit):
-        clan.clan()
+        clan_cli.main()
     captured = capsys.readouterr()
     assert captured.out.startswith("usage:")

From 054ac3f62424a83156cf1a4506e5fb466fecc738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 21 Jul 2023 13:31:13 +0200
Subject: [PATCH 2/2] clan-cli: make mypy it's own derivation

parallelize ci more.
---
 pkgs/clan-cli/default.nix      | 17 ++++++++++-------
 pkgs/clan-cli/flake-module.nix |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix
index 74e88d5..221f1e2 100644
--- a/pkgs/clan-cli/default.nix
+++ b/pkgs/clan-cli/default.nix
@@ -41,7 +41,7 @@ let
     propagatedBuildInputs =
       dependencies
       ++ [ ];
-    passthru.tests = { inherit check; };
+    passthru.tests = { inherit clan-tests clan-mypy; };
     passthru.devDependencies = devDependencies;
     postInstall = ''
       installShellCompletion --bash --name clan \
@@ -53,16 +53,19 @@ let
 
   checkPython = python3.withPackages (_ps: devDependencies ++ dependencies);
 
-  check = runCommand "${name}-check" { } ''
+  clan-mypy = runCommand "${name}-mypy" { } ''
     cp -r ${src} ./src
     chmod +w -R ./src
     cd src
-    export PYTHONPATH=.
-    echo -e "\x1b[32m## run ruff\x1b[0m"
-    ${ruff}/bin/ruff check .
-    echo -e "\x1b[32m## run mypy\x1b[0m"
     ${checkPython}/bin/mypy .
-    echo -e "\x1b[32m## run pytest\x1b[0m"
+    touch $out
+  '';
+
+  clan-tests = runCommand "${name}-tests" { } ''
+    cp -r ${src} ./src
+    chmod +w -R ./src
+    cd src
+    find .
     ${checkPython}/bin/pytest
     touch $out
   '';
diff --git a/pkgs/clan-cli/flake-module.nix b/pkgs/clan-cli/flake-module.nix
index 6426e48..1d1d144 100644
--- a/pkgs/clan-cli/flake-module.nix
+++ b/pkgs/clan-cli/flake-module.nix
@@ -7,6 +7,6 @@
     in
     {
       packages.${name} = package;
-      checks.${name} = package.tests.check;
+      checks = package.tests;
     };
 }