Merge pull request #826 from int-brain-lab/iblrigv8dev

8.28.2

Author: bimac

.github/workflows/main.yaml

@@ -43,8 +43,10 @@ jobs:
       - name: Install audio library (Ubuntu only)
         if: matrix.os == 'ubuntu-latest'
         run: sudo apt-get install -y libportaudio2
-      - name: Set environment variable
-        run: echo "GITHUB_ACTIONS=true" >> $GITHUB_ENV
+      - uses: pyvista/setup-headless-display-action@v3
+        with:
+          qt: true
+          pyvista: false
       - name: iblrig unit tests
         run: pdm run pytest
       - name: coveralls.io

CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+8.28.2
+------
+* fixed: ensure that reward amount shown in online plots stays visible at all times
+
 8.28.1
 ------
 * fixed: online plots showed incorrect reward amount

iblrig/__init__.py

@@ -6,4 +6,4 @@
 # 5) git tag the release in accordance to the version number below (after merge!)
 # >>> git tag 8.15.6
 # >>> git push origin --tags
-__version__ = '8.28.1'
+__version__ = '8.28.2'

iblrig/gui/online_plots.py

@@ -146,7 +146,7 @@ def __init__(self, *args, barColor: Any = 0.2, textColor: Any = 1.0, textFormat:
     def setValue(self, value: float):
         self._barGraphItem.setOpts(height=value)
         self._textItem.setText(self._textFormat.format(value))
-        self._textItem.setY(value)
+        self._textItem.setY(min(self.plotItem.viewRange()[1][1], value))
         self._setTextAnchor()
 
     def resizeEvent(self, ev):

iblrig/test/test_online_plots.py

@@ -1,4 +1,3 @@
-import os
 import zipfile
 from pathlib import Path
 from tempfile import TemporaryDirectory
@@ -10,10 +9,6 @@
 zip_jsonable = Path(__file__).parent.joinpath('fixtures', 'online_plots_biased_iblrigv7.zip')
 
 
-@pytest.mark.skipif(
-    os.getenv('GITHUB_ACTIONS') == 'true' and os.name == 'posix' and os.uname().sysname == 'Linux',
-    reason='Skipping test on GitHub Actions Ubuntu runners',
-)
 class TestOnlinePlots:
     @pytest.fixture
     def task_file(self):
@@ -79,11 +74,11 @@ def test_colors(self, task_file, qtbot):
         model._n_trials_engaged = 401
         model.compute_end_session_criteria()
         with qtbot.assertNotEmitted(model.titleColorChanged):
-            model._trial_data['response_time'][-20:] = 5
+            model._trial_data.loc[model._trial_data.index[-20:], 'response_time'] = 5
             model.compute_end_session_criteria()
             assert model.titleColor == op.Colors.TRANSPARENT
         with qtbot.waitSignal(model.titleColorChanged, timeout=5):
-            model._trial_data['response_time'][-20:] = 5.1
+            model._trial_data.loc[model._trial_data.index[-20:], 'response_time'] = 6
             model.compute_end_session_criteria()
             assert model.titleColor == op.Colors.YELLOW