Squashed commit of the following:

commit 0b698cea7230e63913dc174f7d290b2251241bad
Author: David Meyer <[email protected]>
Date:   Fri Feb 9 10:22:53 2024 -0500

    Merge pull request #64 from dihm/update_release_workflow

    Version bump gh actions to update node.js to 20

commit 332228533d61b80613748dbaab8a1e3a0d109e72
Author: David Meyer <[email protected]>
Date:   Fri Feb 9 08:02:55 2024 -0500

    Merge pull request #61 from carterturn/carterturn-dropdown-cleaning

    Remove shot from "select markers" drop down when shot is removed

commit 5dd5c5dd943b0acecac624709b6b79a0b42409b0
Author: David Meyer <[email protected]>
Date:   Fri Feb 9 07:45:40 2024 -0500

    Merge pull request #63 from dihm/setuptools_scm_fix

    Ensure `release-branch-semver` is used.

Author: dihm

.github/workflows/release.yml

@@ -64,7 +64,7 @@ jobs:
     if: github.repository == 'labscript-suite/runviewer' && (github.event_name != 'create' || github.event.ref_type != 'branch')
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -73,7 +73,7 @@ jobs:
         run: git tag -d $(git tag --points-at HEAD)
 
       - name: Install Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           architecture: ${{ matrix.arch }}
@@ -93,7 +93,7 @@ jobs:
 
       - name: Upload Artifact
         if: strategy.job-index == 0 || (env.PURE == 'false' && runner.os != 'Linux')
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dist
           path: ./dist
@@ -111,7 +111,7 @@ jobs:
 
       - name: Install Miniconda
         if: matrix.conda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           auto-update-conda: true
           python-version: ${{ matrix.python }}
@@ -140,7 +140,7 @@ jobs:
 
       - name: Upload Artifact
         if: matrix.conda
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: conda_packages
           path: ./conda_packages
@@ -153,7 +153,7 @@ jobs:
     steps:
       - name: Checkout
         if: env.PURE == 'false'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -170,7 +170,7 @@ jobs:
 
       - name: Upload Artifact
         if: env.PURE == 'false'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dist
           path: dist/*manylinux*.whl
@@ -182,13 +182,13 @@ jobs:
     steps:
 
       - name: Download Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: dist
           path: ./dist
 
       - name: Download Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: conda_packages
           path: ./conda_packages
@@ -226,7 +226,7 @@ jobs:
           password: ${{ secrets.pypi }}
 
       - name: Install Miniconda
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
           auto-update-conda: true
 

pyproject.toml

@@ -1,3 +1,5 @@
 [build-system]
-requires = ["setuptools", "wheel", "setuptools_scm", "cython"]
-build-backend = "setuptools.build_meta"
+requires = ["setuptools>=64", "wheel", "setuptools_scm>=8", "cython"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools_scm]

runviewer/__main__.py

@@ -697,6 +697,9 @@ def on_remove_shots(self, confirm=True):
             # unselect shot
             item.setCheckState(Qt.Unchecked)
             shutter_item.setCheckState(Qt.Unchecked)
+            # remove shot from markers list
+            shot_combobox_index = self.ui.markers_comboBox.findText(os.path.basename(shot.path))
+            self.ui.markers_comboBox.removeItem(shot_combobox_index)
             # remove row
             self.shot_model.removeRow(row)
             del shot

runviewer/__version__.py

@@ -6,7 +6,7 @@
     import importlib_metadata
 
 VERSION_SCHEME = {
-    "version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
+    "version_scheme": os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),
     "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
 }
 

setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup
 
 VERSION_SCHEME = {
-    "version_scheme": os.getenv("SCM_VERSION_SCHEME", "guess-next-dev"),
+    "version_scheme": os.getenv("SCM_VERSION_SCHEME", "release-branch-semver"),
     "local_scheme": os.getenv("SCM_LOCAL_SCHEME", "node-and-date"),
 }