fix: fix update template workflow

.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.2.2
 _src_path: https://github.com/bec-project/plugin_copier_template.git
 make_commit: true
 project_name: bec_testing_plugin

.gitea/workflows/ci.yml

@@ -28,7 +28,7 @@ on:
         description: "Python version to use"
         required: false
         type: string
-        default: "3.12"
+        default: "3.11"
 
 permissions:
   pull-requests: write
@@ -44,19 +44,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: "${{ inputs.PYTHON_VERSION || '3.12' }}"
-
-      - name: Checkout BEC Plugin Repository
-        uses: actions/checkout@v4
-        with:
-          repository: bec/bec_testing_plugin
-          ref: "${{ inputs.BEC_PLUGIN_REPO_BRANCH || github.head_ref || github.sha }}"
-          path: ./bec_testing_plugin
-
-      - name: Lint for merge conflicts from template updates
-        shell: bash
-        # Find all Copier conflicts except this line
-        run: '! grep -r "<<<<<<< before updating" | grep -v "grep -r \"<<<<<<< before updating"'
+          python-version: "${{ inputs.PYTHON_VERSION || '3.11' }}"
 
       - name: Checkout BEC Core
         uses: actions/checkout@v4
@@ -79,6 +67,13 @@ jobs:
           ref: "${{ inputs.BEC_WIDGETS_BRANCH || 'main' }}"
           path: ./bec_widgets
 
+      - name: Checkout BEC Plugin Repository
+        uses: actions/checkout@v4
+        with:
+          repository: bec/bec_testing_plugin
+          ref: "${{ inputs.BEC_PLUGIN_REPO_BRANCH || github.head_ref || github.sha }}"
+          path: ./bec_testing_plugin
+
       - name: Install dependencies
         shell: bash
         run: |

.gitea/workflows/create_update_pr.yml

@@ -1,4 +1,4 @@
-name: Create template upgrade PR for {{ project_name }}
+name: Create template upgrade PR for bec_testing_plugin
 on:
   workflow_dispatch:
 
@@ -16,27 +16,17 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: '3.12'
+    
+      - name: Install tools
+        run: |
+          pip install copier PySide6
 
       - name: Checkout
         uses: actions/checkout@v4
-
-      - name: Create virtualenv
-        run: |
-          python -m virtualenv .venv
-
-      - name: Install tools
-        run: |
-          source .venv/bin/activate
-          echo $(which python)
-          echo $(python -m pip list)
-          python -m pip install copier PySide6 bec_lib
-          echo $(which copier)
-          python -c "import bec_lib; print(bec_lib.__file__)"
-
+    
       - name: Perform update
         run: |
-          source .venv/bin/activate
           git config --global user.email "bec_ci_staging@psi.ch"
           git config --global user.name "BEC automated CI"
 
@@ -45,10 +35,8 @@ jobs:
           git checkout -b $branch
 
           echo "Running copier update..."
-          python -m copier update --trust --defaults --conflict inline 2>&1 | tee copier.log
-          status=${PIPESTATUS[0]}
-          output="$(cat copier.log)"
-          echo $output
+          output="$(copier update --trust --defaults --conflict inline 2>&1)"
+          echo "$output"
           msg="$(printf '%s\n' "$output" | head -n 1)"
 
           if ! grep -q "make_commit: true" .copier-answers.yml ; then

.gitlab-ci.yml

@@ -0,0 +1,7 @@
+include:
+- file: /templates/plugin-repo-template.yml
+  inputs:
+    name: bec_testing_plugin
+    target: bec_testing_plugin
+    branch: $CHILD_PIPELINE_BRANCH
+  project: bec/awi_utils

bec_testing_plugin/scans/scan_customization/scan_components.py

@@ -1,12 +0,0 @@
-"""
-Scan components for bec_testing_plugin.
-
-The scan components module allows you to define custom components that can be used in your scans.
-These components can be used to encapsulate reusable logic, interact with devices, or perform specific actions during the scan lifecycle.
-"""
-
-from bec_server.scan_server.scans.scan_components import ScanComponents
-
-
-class BecTestingPluginScanComponents(ScanComponents):
-    """Scan components for bec_testing_plugin."""

bec_testing_plugin/scans/scan_customization/scan_modifier.py

@@ -1,33 +0,0 @@
-"""
-Scan modifier plugin for bec_testing_plugin.
-
-The scan modifier allows you to modify the scan lifecycle and run custom actions before or after the scan hook or replace the scan hook entirely.
-Note that the scan_modifier module must be registered as a plugin in the pyproject.toml file for it to be recognized by the BEC framework and that
-there can only be one scan_modifier plugin registered at a time. If you need to run multiple scan modifiers, you can create a single scan
-modifier plugin that runs multiple actions in sequence with conditional logic to determine which actions to run based on the scan context.
-"""
-
-from bec_server.scan_server.scans.scan_modifier import ScanModifier, scan_hook_impl
-
-
-class BecTestingPluginScanModifier(ScanModifier):
-    """
-    Scan modifier for bec_testing_plugin.
-    
-    By inheriting from the ScanModifier base class, you get access to currently running scan (self.scan), the devices (self.dev), the scan info (self.scan_info),
-    the scan components (self.components) and the scan actions (self.actions).
-    """
-
-    def __init__(self, **kwargs):
-        """Initialize the scan modifier."""
-        super().__init__(**kwargs)
-
-    # Example of running code before the scan stage for a specific scan
-    # @scan_hook_impl("stage", "before")
-    # def before_stage(self):
-    #     """Run before the stage hook."""
-    #     self.actions.send_client_info("Custom stage logic executed by ScanModifier.")
-    #     if self.scan_info.scan_name == "example_scan":
-    #         self.dev.samx.set(20)
-
-    

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 name = "bec_testing_plugin"
 version = "0.0.0"
 description = "A plugin repository for BEC"
-requires-python = ">=3.11"
+requires-python = ">=3.10"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Programming Language :: Python :: 3",
@@ -39,9 +39,6 @@ plugin_file_writer = "bec_testing_plugin.file_writer"
 [project.entry-points."bec.scans"]
 plugin_scans = "bec_testing_plugin.scans"
 
-[project.entry-points."bec.scans.scan_modifier"]
-plugin_scan_modifier = "bec_testing_plugin.scans.scan_customization.scan_modifier"
-
 [project.entry-points."bec.scans.metadata_schema"]
 plugin_metadata_schema = "bec_testing_plugin.scans.metadata_schema"