Various updates

Author: ElePT

.github/workflows/update-version-pr.yaml

@@ -27,25 +27,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Ensure jq is installed
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y jq
-
       - name: Read current pin from requirements.txt
         id: current
         run: |
           LINE=$(grep -E '^qiskit-serverless~=' requirements.txt | head -n1 || true)
-          if [ -z "$LINE" ]; then
-            echo "Could not find 'qiskit-serverless~=' in requirements.txt" >&2
-            exit 1
-          fi
-
           CURR_VER="${LINE#*~=}"
           echo "Current pin version: $CURR_VER"
-
           IFS='.' read -r CURR_MAJ CURR_MIN CURR_PAT <<< "$CURR_VER"
-
           echo "curr_major=$CURR_MAJ" >> "$GITHUB_OUTPUT"
           echo "curr_minor=$CURR_MIN" >> "$GITHUB_OUTPUT"
           echo "curr_patch=$CURR_PAT" >> "$GITHUB_OUTPUT"
@@ -71,7 +59,6 @@ jobs:
               | jq -r '.releases | keys[]' \
               | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' \
               | sort -V | tail -n1)
-
             if [ -z "$LATEST" ]; then
               echo "Failed to determine latest stable version from PyPI." >&2
               exit 1
@@ -80,7 +67,6 @@ jobs:
 
           echo "Using latest version: $LATEST"
           IFS='.' read -r L_MAJ L_MIN L_PAT <<< "$LATEST"
-
           echo "latest=$LATEST" >> "$GITHUB_OUTPUT"
           echo "latest_major=$L_MAJ" >> "$GITHUB_OUTPUT"
           echo "latest_minor=$L_MIN" >> "$GITHUB_OUTPUT"
@@ -116,33 +102,30 @@ jobs:
         if: steps.decision.outputs.update == 'true'
         id: apply
         run: |
+          # Compute new catalog version
+          OLD_VER=$(tr -d '[:space:]' < qiskit_ibm_catalog/VERSION.txt)
+          IFS='.' read -r A B C <<< "$OLD_VER"
+          if [ "$UPDATE_TYPE" = "major" ]; then
+            NEW_VER="$((A + 1)).0.0"
+          else
+            NEW_VER="${A}.$((B + 1)).0"
+          fi
+          BRANCH="prepare-${NEW_VER}-release"
+
+          # Compute new serverless pin
           UPDATE_TYPE="${{ steps.decision.outputs.update_type }}"
           LM=${{ steps.pypi.outputs.latest_major }}
           Ln=${{ steps.pypi.outputs.latest_minor }}
-
           if [ "$UPDATE_TYPE" = "major" ]; then
             NEW_PIN_VER="${LM}.0.0"
-            BRANCH="release/qiskit-serverless-${LM}.0-major"
           else
             NEW_PIN_VER="${LM}.${Ln}.0"
-            BRANCH="release/qiskit-serverless-${LM}.${Ln}-minor"
           fi
 
+          # Apply updates
           echo "Updating pin to qiskit-serverless~=${NEW_PIN_VER}"
-
           sed -i -E "s/^qiskit-serverless~=[0-9]+\.[0-9]+\.[0-9]+/qiskit-serverless~=${NEW_PIN_VER}/" requirements.txt
-
-          OLD_VER=$(tr -d '[:space:]' < qiskit_ibm_catalog/VERSION.txt)
-          IFS='.' read -r A B C <<< "$OLD_VER"
-
-          if [ "$UPDATE_TYPE" = "major" ]; then
-            NEW_VER="$((A + 1)).0.0"
-          else
-            NEW_VER="${A}.$((B + 1)).0"
-          fi
-
           echo "$NEW_VER" > qiskit_ibm_catalog/VERSION.txt
-
           echo "branch=$BRANCH" >> "$GITHUB_OUTPUT"
           echo "new_pkg_version=$NEW_VER" >> "$GITHUB_OUTPUT"
           echo "new_pin_version=$NEW_PIN_VER" >> "$GITHUB_OUTPUT"
@@ -155,18 +138,20 @@ jobs:
           branch: ${{ steps.apply.outputs.branch }}
           base: main
           title: >
-            Prepare release: qiskit-serverless → ~=${{ steps.apply.outputs.new_pin_version }},
-            bump to ${{ steps.apply.outputs.new_pkg_version }}
+            Prepare ${{ steps.apply.outputs.new_pkg_version }}
           body: |
             This PR prepares a new release of **qiskit-ibm-catalog**:
 
-            - Update requirement: `qiskit-serverless~=${{ steps.apply.outputs.new_pin_version }}`
             - Bump catalog version → `${{ steps.apply.outputs.new_pkg_version }}`
-            - Patch-only upstream updates are ignored
-            - Upstream **minor** → bump our **minor**
-            - Upstream **major** → bump our **major**
-
-            After merging, push the tag `v${{ steps.apply.outputs.new_pkg_version }}`.
+            - Update requirement → `qiskit-serverless~=${{ steps.apply.outputs.new_pin_version }}`
+            - Patch-only updates of `qiskit-serverless` are ignored
+            
+            To release the package:
+
+            - Merge this PR
+            - Tag with `v${{ steps.apply.outputs.new_pkg_version }}`
+            - Push the tag `v${{ steps.apply.outputs.new_pkg_version }}`
+            
           labels: |
             release
             automation