fix: remove merge conflicts

.copier-answers.yml

@@ -2,7 +2,7 @@
 # It is needed to track the repo template version, and editing may break things.
 # This file will be overwritten by copier on template updates.
 
-_commit: v1.3.1
+_commit: v1.4.0
 _src_path: https://github.com/bec-project/plugin_copier_template.git
 make_commit: true
 project_name: bec_testing_plugin

.gitea/workflows/create_update_pr.yml

@@ -6,44 +6,33 @@ permissions:
   pull-requests: write
 
 jobs:
-<<<<<<< before updating
-  test:
-    runs-on: ubuntu-latest
-=======
   create_update_branch_and_pr:
     runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
->>>>>>> after updating
 
     steps:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.12'
-    
-      - name: Install tools
-        run: |
-<<<<<<< before updating
-          pip install copier
-=======
-          pip install copier PySide6
->>>>>>> after updating
 
       - name: Checkout
         uses: actions/checkout@v4
-    
+
+      - name: Create virtualenv
+        run: |
+    	  python -m virtualenv .venv
+
+      - name: Install tools
+        run: |
+          source .venv/bin/activate
+          pip install copier PySide6 bec_lib
+
       - name: Perform update
         run: |
-<<<<<<< before updating
-          branch="chore/update-template-$(python -m uuid)"
-          git checkout -b $branch
-          msg = $(copier update --trust --defaults --conflict inline 2>&1 | sed -n 1p)
-          git add -A
-          git diff-index --quiet HEAD || git commit -a -m $msg
-          git push -u origin $branch
-=======
+          source .venv/bin/activate
           git config --global user.email "bec_ci_staging@psi.ch"
           git config --global user.name "BEC automated CI"
 
@@ -52,8 +41,10 @@ jobs:
           git checkout -b $branch
 
           echo "Running copier update..."
-          output="$(copier update --trust --defaults --conflict inline 2>&1)"
-          echo "$output"
+          copier update --trust --defaults --conflict inline 2>&1 | tee copier.log
+          status=${PIPESTATUS[0]}
+          output="$(cat copier.log)"
+          echo $output
           msg="$(printf '%s\n' "$output" | head -n 1)"
 
           if ! grep -q "make_commit: true" .copier-answers.yml ; then
@@ -77,4 +68,3 @@ jobs:
                   \"head\": \"$(echo $branch)\",
                   \"base\": \"main\"
                 }"
->>>>>>> after updating