From cc43158e381e718ad193ca5ce149a602bab64325 Mon Sep 17 00:00:00 2001
From: Skhendle <skhendle@gmail.com>
Date: Sat, 17 Jan 2026 21:33:03 +0000
Subject: [PATCH 1/5] bug fix

---
 .github/workflows/build-and-test.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e1c7254..5bb58f0 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -1,7 +1,10 @@
 name: CI - Integration Tests with uv
 
 on:
-  push:
+  # push:
+  #   branches: [main]
+
+  pull_request:
     branches: [main]
 
 permissions:
@@ -54,7 +57,7 @@ jobs:
         run: |
           source .venv/bin/activate
           uv pip install coverage
-          coverage run -m unittest discover -s tests -v
+          coverage run -m pytest
           mkdir -p coverage_reports
           coverage xml -o coverage_reports/coverage.xml
           coverage report -m

From 8b58b478061a59cca29b50188692094b75a1e661 Mon Sep 17 00:00:00 2001
From: Skhendle <skhendle@gmail.com>
Date: Sat, 17 Jan 2026 21:38:21 +0000
Subject: [PATCH 2/5] bug fixes

---
 .github/workflows/build-and-test.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 5bb58f0..6096753 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -48,10 +48,17 @@ jobs:
 
       - name: Commit and Push formatting changes
         run: |
-          git pull
+          git checkout "${GITHUB_REF_NAME}"
+          git pull origin "${GITHUB_REF_NAME}"
+
           git add .
-          git diff --quiet && git diff --staged --quiet || git commit -m "style: auto-format code with Black"
-          git push origin HEAD:${{ github.ref_name }}
+          if ! git diff --cached --quiet; then
+            git commit -m "style: auto-format code with Black"
+            git push origin "${GITHUB_REF_NAME}"
+          else
+            echo "No formatting changes to commit"
+          fi
+
 
       - name: Run tests with coverage (unittest)
         run: |

From bfd3610aa53a9e5ff410ec75c3f8eb7e9695c1e0 Mon Sep 17 00:00:00 2001
From: Skhendle <skhendle@gmail.com>
Date: Sat, 17 Jan 2026 21:40:56 +0000
Subject: [PATCH 3/5] get curr branch

---
 .github/workflows/build-and-test.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 6096753..682d0d8 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -47,14 +47,21 @@ jobs:
           git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
 
       - name: Commit and Push formatting changes
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        env:
+          BRANCH_NAME: ${{ github.head_ref }}
         run: |
-          git checkout "${GITHUB_REF_NAME}"
-          git pull origin "${GITHUB_REF_NAME}"
+          echo "Pushing to PR branch: ${BRANCH_NAME}"
+
+          # Ensure we have the branch locally (checkout in PR runs can be detached)
+          git fetch origin "${BRANCH_NAME}:${BRANCH_NAME}"
+          git checkout "${BRANCH_NAME}"
+          git pull origin "${BRANCH_NAME}"
 
           git add .
           if ! git diff --cached --quiet; then
             git commit -m "style: auto-format code with Black"
-            git push origin "${GITHUB_REF_NAME}"
+            git push origin "${BRANCH_NAME}"
           else
             echo "No formatting changes to commit"
           fi

From 7291b42b08eb62b091ad76373d2bfbaa22852eec Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Sat, 17 Jan 2026 21:41:15 +0000
Subject: [PATCH 4/5] style: auto-format code with Black

---
 uv.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uv.lock b/uv.lock
index aea2e34..beecf12 100644
--- a/uv.lock
+++ b/uv.lock
@@ -453,7 +453,7 @@ wheels = [
 
 [[package]]
 name = "userverse-python-client"
-version = "0.1.3"
+version = "0.1.4"
 source = { editable = "." }
 dependencies = [
     { name = "black" },

From b467a1acacdee08c35eb208ccd3843bdf18d51bf Mon Sep 17 00:00:00 2001
From: Sandile Khendle <36414340+Skhendle@users.noreply.github.com>
Date: Sat, 17 Jan 2026 23:43:30 +0200
Subject: [PATCH 5/5] Update build-and-test.yml

pytest naming
---
 .github/workflows/build-and-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 682d0d8..1842ff3 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -67,10 +67,10 @@ jobs:
           fi
 
 
-      - name: Run tests with coverage (unittest)
+      - name: Run tests with coverage (pytest)
         run: |
           source .venv/bin/activate
-          uv pip install coverage
+          uv pip install coverage pytest
           coverage run -m pytest
           mkdir -p coverage_reports
           coverage xml -o coverage_reports/coverage.xml