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

8.19.4
int-brain-lab · Jun 7, 2024 · 628f635 · 628f635
2 parents c5748eb + eda9ca2
commit 628f635
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 82 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@ Changelog
 ---------
 
 
+8.19.4
+------
+* hotfix: fix validation for Alyx when no Alyx URL has been set
+* hotfix: fix validation for Bpod HiFi module
+* adapted update instructions in update notification & documentation
+
 8.19.3
 ------
 * hotfix: force stimulus to freeze in center of screen during "freeze_reward" state

diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -221,15 +221,6 @@ Updating iblrigv8
 
 To update iblrigv8 to the newest version:
 
-.. code-block:: powershell
-
-  C:\iblrigv8\venv\scripts\Activate.ps1
-  upgrade_iblrig
-
-
-If you're on an older version of iblrigv8, the command above may not be available yet.
-You can then run the following instead:
-
 .. code-block:: powershell
 
   C:\iblrigv8\venv\scripts\Activate.ps1

diff --git a/iblrig/__init__.py b/iblrig/__init__.py
@@ -6,7 +6,7 @@
 # 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.19.3'
+__version__ = '8.19.4'
 
 
 from iblrig.version_management import get_detailed_version_string

diff --git a/iblrig/gui/ui_update.py b/iblrig/gui/ui_update.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'iblrig/gui/ui_update.ui'
+# Form implementation generated from reading ui file 'iblrig\gui\ui_update.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.9
+# Created by: PyQt5 UI code generator 5.15.10
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -21,7 +21,7 @@ def setupUi(self, update):
         sizePolicy.setHeightForWidth(update.sizePolicy().hasHeightForWidth())
         update.setSizePolicy(sizePolicy)
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap("iblrig/gui/wizard.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap("iblrig\\gui\\wizard.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         update.setWindowIcon(icon)
         update.setModal(True)
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout(update)
@@ -45,6 +45,7 @@ def setupUi(self, update):
         self.uiLabelHeader.setObjectName("uiLabelHeader")
         self.uiLayoutRight.addWidget(self.uiLabelHeader)
         self.uiTextBrowserChanges = QtWidgets.QTextBrowser(update)
+        self.uiTextBrowserChanges.setSizeIncrement(QtCore.QSize(0, 0))
         self.uiTextBrowserChanges.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
         self.uiTextBrowserChanges.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
         self.uiTextBrowserChanges.setMarkdown("")
@@ -63,32 +64,24 @@ def setupUi(self, update):
         self.uiLayoutRight.addWidget(self.uiLabelFooter)
         spacerItem1 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
         self.uiLayoutRight.addItem(spacerItem1)
-        self.uiLayoutCommand = QtWidgets.QHBoxLayout()
-        self.uiLayoutCommand.setObjectName("uiLayoutCommand")
-        spacerItem2 = QtWidgets.QSpacerItem(1, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.uiLayoutCommand.addItem(spacerItem2)
-        self.uiLineEditCommand = QtWidgets.QLineEdit(update)
-        self.uiLineEditCommand.setStyleSheet("background-color: rgb(1, 36, 86);\n"
+        self.plainTextEdit = QtWidgets.QPlainTextEdit(update)
+        self.plainTextEdit.setMaximumSize(QtCore.QSize(16777215, 37))
+        self.plainTextEdit.setStyleSheet("background-color: rgb(1, 36, 86);\n"
 "color: rgb(255, 255, 255);")
-        self.uiLineEditCommand.setFrame(False)
-        self.uiLineEditCommand.setAlignment(QtCore.Qt.AlignCenter)
-        self.uiLineEditCommand.setReadOnly(True)
-        self.uiLineEditCommand.setObjectName("uiLineEditCommand")
-        self.uiLayoutCommand.addWidget(self.uiLineEditCommand)
-        spacerItem3 = QtWidgets.QSpacerItem(1, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.uiLayoutCommand.addItem(spacerItem3)
-        self.uiLayoutRight.addLayout(self.uiLayoutCommand)
-        spacerItem4 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        self.uiLayoutRight.addItem(spacerItem4)
+        self.plainTextEdit.setReadOnly(True)
+        self.plainTextEdit.setObjectName("plainTextEdit")
+        self.uiLayoutRight.addWidget(self.plainTextEdit)
+        spacerItem2 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.uiLayoutRight.addItem(spacerItem2)
         self.uiLine = QtWidgets.QFrame(update)
         self.uiLine.setFrameShape(QtWidgets.QFrame.HLine)
         self.uiLine.setFrameShadow(QtWidgets.QFrame.Sunken)
         self.uiLine.setObjectName("uiLine")
         self.uiLayoutRight.addWidget(self.uiLine)
         self.uiLayoutButton = QtWidgets.QHBoxLayout()
         self.uiLayoutButton.setObjectName("uiLayoutButton")
-        spacerItem5 = QtWidgets.QSpacerItem(1, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.uiLayoutButton.addItem(spacerItem5)
+        spacerItem3 = QtWidgets.QSpacerItem(1, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.uiLayoutButton.addItem(spacerItem3)
         self.uiPushButtonOK = QtWidgets.QPushButton(update)
         self.uiPushButtonOK.setObjectName("uiPushButtonOK")
         self.uiLayoutButton.addWidget(self.uiPushButtonOK)
@@ -104,8 +97,9 @@ def retranslateUi(self, update):
         _translate = QtCore.QCoreApplication.translate
         update.setWindowTitle(_translate("update", "Update Notice"))
         self.uiLabelHeader.setText(_translate("update", "Update Available!"))
-        self.uiLabelFooter.setText(_translate("update", "To update, close IBL Rig Wizard and run the following command within the iblrigv8 Python environment:"))
-        self.uiLineEditCommand.setText(_translate("update", "upgrade_iblrig"))
+        self.uiLabelFooter.setText(_translate("update", "To update, close IBL Rig Wizard and run the following commands within the iblrigv8 Python environment:"))
+        self.plainTextEdit.setPlainText(_translate("update", "git pull\n"
+"pip install --upgrade -e ."))
         self.uiPushButtonOK.setText(_translate("update", "OK"))
 from iblrig.gui import resources_rc
 

diff --git a/iblrig/gui/ui_update.ui b/iblrig/gui/ui_update.ui
@@ -77,6 +77,12 @@
      </item>
      <item>
       <widget class="QTextBrowser" name="uiTextBrowserChanges">
+       <property name="sizeIncrement">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="verticalScrollBarPolicy">
         <enum>Qt::ScrollBarAlwaysOn</enum>
        </property>
@@ -100,7 +106,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>To update, close IBL Rig Wizard and run the following command within the iblrigv8 Python environment:</string>
+        <string>To update, close IBL Rig Wizard and run the following commands within the iblrigv8 Python environment:</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignJustify|Qt::AlignVCenter</set>
@@ -127,54 +133,25 @@
       </spacer>
      </item>
      <item>
-      <layout class="QHBoxLayout" name="uiLayoutCommand">
-       <item>
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>1</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QLineEdit" name="uiLineEditCommand">
-         <property name="styleSheet">
-          <string notr="true">background-color: rgb(1, 36, 86);
+      <widget class="QPlainTextEdit" name="plainTextEdit">
+       <property name="maximumSize">
+        <size>
+         <width>16777215</width>
+         <height>37</height>
+        </size>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">background-color: rgb(1, 36, 86);
 color: rgb(255, 255, 255);</string>
-         </property>
-         <property name="text">
-          <string>upgrade_iblrig</string>
-         </property>
-         <property name="frame">
-          <bool>false</bool>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>1</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+       <property name="plainText">
+        <string>git pull
+pip install --upgrade -e .</string>
+       </property>
+      </widget>
      </item>
      <item>
       <spacer name="verticalSpacer_3">

diff --git a/iblrig/hardware_validation.py b/iblrig/hardware_validation.py
@@ -199,6 +199,9 @@ def _run(self):
                     ser.flush()
                     if not (passed := bool(re.search(regex_pattern, return_string))):
                         break
+            ser.__del__()
+            del ser
+
         if passed:
             yield Result(Status.PASS, f'Serial device positively identified as {self.name}')
             return True
@@ -433,7 +436,7 @@ def _run(self):
         # Validate ALYX_URL
         if self.iblrig_settings.ALYX_URL is None:
             yield Result(Status.SKIP, 'ALYX_URL has not been set in hardware_settings.yaml - skipping validation')
-            raise StopIteration(False)
+            return False
         elif not internet_available(timeout=2, force_update=True):
             yield Result(
                 Status.FAIL, f'Cannot connect to {self.iblrig_settings.ALYX_URL.host}', solution='Check your Internet connection'