Resolving conflicts with upstream

.github/workflows/bump.yml

@@ -8,17 +8,21 @@ on:
         required: false
       rule:
         type: choice
-        description: Version bump level
+        description: Version bump level (ignored if explicit version is given)
         required: true
         options:
-        - prerelease
-        - "prerelease --next-phase"
+        - dev
         - prepatch
         - preminor
         - premajor
         - patch
         - minor
         - major
+      version:
+        type: string
+        description: Explicit version (overrides rule), e.g. "X.Y.Zb0" to enter feature freeze.
+        required: false
+        default: ""
 
 jobs:
   Bump:
@@ -27,4 +31,4 @@ jobs:
     secrets: inherit
     with:
       dry-run: ${{ inputs.dry-run }}
-      rule: ${{ inputs.rule }}
+      rule: ${{ inputs.version != '' && inputs.version || inputs.rule }}

.github/workflows/bump_on_dependency.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   Bump:
-    name: Bump prerelease version
+    name: Bump dev version
     if: >
       github.event.pull_request.merged == true &&
       github.event.pull_request.base.ref == 'main' &&
@@ -16,6 +16,5 @@ jobs:
     uses: AstarVienna/DevOps/.github/workflows/bump.yml@main
     secrets: inherit
     with:
-      rule: prerelease
+      rule: dev
       branch: main
-

.github/workflows/notebooks_dispatch.yml

@@ -23,20 +23,20 @@ jobs:
         # is more useful than 5 green and one red. The others can be enabled
         # once we fix the problem properly.
         # os: [ubuntu-latest, windows-latest, macos-latest]
-        # python-version: ['3.8', '3.11']
+        # python-version: ['3.12', '3.14']
         os: [ubuntu-latest]
-        python-version: ["3.11"]
+        python-version: ["3.12"]
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Install poetry
         shell: bash
-        run: pipx install poetry==2.1.4
+        run: pipx install poetry==2.4.1
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/prepare_release.yml

@@ -0,0 +1,47 @@
+name: Prepare release
+on:
+  workflow_dispatch:
+    inputs:
+      rule:
+        type: choice
+        description: Version bump level for the release (ignored if explicit version is given)
+        required: true
+        options:
+        - patch
+        - minor
+        - major
+        - prepatch
+        - preminor
+        - premajor
+      version:
+        type: string
+        description: >
+          Explicit release version (overrides rule), e.g. "X.Y.Zb0" to tag the feature freeze.
+        required: false
+        default: ""
+      notes:
+        type: string
+        description: >
+          Optional manual release notes section, shown above the
+          auto-generated notes. Can also be added or edited in the
+          draft release before publishing.
+        required: false
+        default: ""
+      previous-tag:
+        type: string
+        description: >
+          Optional comparison base for auto-generated notes. Only needed
+          for backport releases from maintenance branches (e.g. "v2.1.0"
+          when releasing 2.1.1 while 2.5.0 already exists).
+        required: false
+        default: ""
+
+jobs:
+  Prepare:
+    name: Prepare release
+    uses: AstarVienna/DevOps/.github/workflows/prepare_release.yml@main
+    secrets: inherit
+    with:
+      rule: ${{ inputs.version != '' && inputs.version || inputs.rule }}
+      notes: ${{ inputs.notes }}
+      previous-tag: ${{ inputs.previous-tag }}

.github/workflows/tests.yml

@@ -19,16 +19,24 @@ jobs:
     name: Offline tests
     uses: AstarVienna/DevOps/.github/workflows/tests.yml@main
     secrets: inherit
+    with:
+      python-versions: '["3.12", "3.13", "3.14"]'
+      python-min: "3.12"  # limited versions for macOS only
+      python-max: "3.14"  # limited versions for macOS only
 
   call-webtests:
     name: Network tests
     uses: AstarVienna/DevOps/.github/workflows/webtests.yml@main
     secrets: inherit
+    with:
+      python-versions: '["3.12", "3.14"]'
 
   call-updated-tests:
     name: Tests with updated dependencies
     uses: AstarVienna/DevOps/.github/workflows/updated_tests.yml@main
     secrets: inherit
+    with:
+      python-versions: '["3.12", "3.14"]'
 
   call-notebooks-with-clone:
     name: Notebook tests

.readthedocs.yaml

@@ -5,9 +5,9 @@
 version: 2
 
 build:
-  os: "ubuntu-24.04"
+  os: "ubuntu-26.04"
   tools:
-    python: "3.11"
+    python: "3.14"
   jobs:
     post_checkout:
       - git clone -n --depth=1 --filter=tree:0 https://github.com/AstarVienna/irdb ./docs/source/examples/inst_pkgs