From cfd1089ff3e140db4e7c89725a799172e04e5a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 3 Aug 2023 15:29:50 +0200
Subject: [PATCH 1/2] tea-create-pr: use force push

---
 flake-parts/tea-create-pr/script.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/flake-parts/tea-create-pr/script.sh b/flake-parts/tea-create-pr/script.sh
index cbe9d6dfc..385d7147f 100644
--- a/flake-parts/tea-create-pr/script.sh
+++ b/flake-parts/tea-create-pr/script.sh
@@ -21,8 +21,7 @@ rest=$(echo "$COMMIT_MSG" | tail -n+2)
 if [[ "$firstLine" == "$rest" ]]; then
   rest=""
 fi
-
-git push -u "$remoteName" HEAD:refs/heads/"$tempRemoteBranch"
+git push --force -u "$remoteName" HEAD:refs/heads/"$tempRemoteBranch"
 
 tea pr create \
   --title "$firstLine" \

From b540f318c78f79a5cd89054db131f10486511bed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 3 Aug 2023 15:33:08 +0200
Subject: [PATCH 2/2] cli: add test for --help

---
 pkgs/clan-cli/default.nix    | 3 +++
 pkgs/clan-cli/pyproject.toml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix
index 62f533426..67aefb4f3 100644
--- a/pkgs/clan-cli/default.nix
+++ b/pkgs/clan-cli/default.nix
@@ -77,5 +77,8 @@ python3.pkgs.buildPythonPackage {
     installShellCompletion --fish --name clan.fish \
       <(${argcomplete}/bin/register-python-argcomplete --shell fish clan)
   '';
+  checkPhase = ''
+    PYTHONPATH= $out/bin/clan --help
+  '';
   meta.mainProgram = "clan";
 }
diff --git a/pkgs/clan-cli/pyproject.toml b/pkgs/clan-cli/pyproject.toml
index aefca3dda..38ad09c74 100644
--- a/pkgs/clan-cli/pyproject.toml
+++ b/pkgs/clan-cli/pyproject.toml
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "clan"
 description = "cLAN CLI tool"
 dynamic = [ "version" ]
-scripts = { clan = "clan_cli.cli:main" }
+scripts = { clan = "clan_cli:main" }
 
 [tool.setuptools.packages]
 find = {}