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

8.11.2

CHANGELOG.md

@@ -3,6 +3,12 @@ Changelog
 
 -------------------------------
 
+8.11.2
+------
+* make custom_tasks optional
+* repair lost entry-point for iblrig wizard
+* fetch remote tags only if connected to internet
+
 8.11.1
 ------
 * add GUI options for AdvancedChoiceWorld

iblrig/__init__.py

@@ -4,7 +4,7 @@
 # 3) Check CI and eventually wet lab test
 # 4) Pull request to iblrigv8
 # 5) git tag the release in accordance to the version number below (after merge!)
-__version__ = '8.11.1'
+__version__ = '8.11.2'
 
 # The following method call will try to get post-release information (i.e. the number of commits since the last tagged
 # release corresponding to the one above), plus information about the state of the local repository (dirty/broken)

iblrig/gui/wizard.py

@@ -21,7 +21,12 @@
 
 from one.api import ONE
 import iblrig_tasks
-import iblrig_custom_tasks
+try:
+    import iblrig_custom_tasks
+    CUSTOM_TASKS = True
+except ImportError:
+    CUSTOM_TASKS = False
+    pass
 import iblrig.path_helper
 from iblrig.constants import BASE_DIR
 from iblrig.misc import _get_task_argument_parser
@@ -95,11 +100,15 @@ def __post_init__(self):
         self.iblrig_settings = iblrig.path_helper.load_settings_yaml()
         self.all_users = [self.iblrig_settings['ALYX_USER']] if self.iblrig_settings['ALYX_USER'] else []
         self.all_procedures = sorted(PROCEDURES)
-        # for the tasks, we build a dictionary that contains the task name as key and the path to the task.py as value
+
+        # for the tasks, we build a dictionary that contains the task name as key and the path to task.py as value
         tasks = sorted([p for p in Path(iblrig_tasks.__file__).parent.rglob('task.py')])
-        tasks.extend(sorted([p for p in Path(iblrig_custom_tasks.__file__).parent.rglob('task.py')]))
+        if CUSTOM_TASKS:
+            tasks.extend(sorted([p for p in Path(iblrig_custom_tasks.__file__).parent.rglob('task.py')]))
         self.all_tasks = OrderedDict({p.parts[-2]: p for p in tasks})
+
         self.all_projects = sorted(PROJECTS)
+
         # get the subjects from iterating over folders in the the iblrig data path
         if self.iblrig_settings['iblrig_local_data_path'] is None:
             self.all_subjects = [self.test_subject_name]
@@ -847,6 +856,7 @@ def main():
     QtCore.QCoreApplication.setOrganizationName("International Brain Laboratory")
     QtCore.QCoreApplication.setOrganizationDomain("internationalbrainlab.org")
     QtCore.QCoreApplication.setApplicationName("IBLRIG Wizard")
+
     if os.name == 'nt':
         app_id = f'IBL.iblrig.wizard.{iblrig.__version__}'
         ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(app_id)

iblrig/version_management.py

@@ -173,7 +173,7 @@ def get_remote_tags() -> None:
     -----
     This method will only work with installations managed through Git.
     """
-    if get_remote_tags.is_fetched_already:
+    if get_remote_tags.is_fetched_already or not internet_available():
         return
     if not IS_GIT:
         log.error('This installation of iblrig is not managed through git')

pyproject.toml

@@ -56,6 +56,7 @@ transfer_video_data = "iblrig.commands:transfer_video_data_cli"
 transfer_ephys_data = "iblrig.commands:transfer_ephys_data_cli"
 flush = "iblrig.commands:flush"
 remove-old-sessions = "iblrig.commands:remove_local_sessions"
+iblrig = "iblrig.gui.wizard:main"
 upgrade_iblrig = "iblrig.version_management:upgrade"
 install_spinnaker = "iblrig.camera:install_spinnaker_sdk"