Merge branch 'main' into issue314/crash-if-no-run-folder

README.md

@@ -554,7 +554,7 @@ And for our Awesome Logo please checkout out [@tim_bassford](https://twitter.com
 <!-- start-changelog -->
 # Changelog
 ## Unreleased changes
-None currently.
+1. Change the default `unblock_duration` on the `Analysis` class to use `DEFAULT_UNBLOCK` value defined in `_cli_args.py`. Change type on the Argparser for `--unblock-duration` to float. (#313)
 ## 2023.1.1
 1. Fix Readme Logo link 🥳 (#296)
 1. Fix bug where we had accidentally started requiring barcoded TOMLs to specify a region. Thanks to @jamesemery for catching this. (#299)

src/readfish/_cli_args.py

@@ -89,7 +89,7 @@
         "--unblock-duration",
         dict(
             metavar="UNBLOCK-DURATION",
-            type=int,
+            type=float,
             help="Time, in seconds, to apply unblock voltage (default: {})".format(
                 DEFAULT_UNBLOCK
             ),

src/readfish/entry_points/targets.py

@@ -81,7 +81,7 @@
 from minknow_api import protocol_service
 
 # Library
-from readfish._cli_args import DEVICE_BASE_ARGS
+from readfish._cli_args import DEVICE_BASE_ARGS, DEFAULT_UNBLOCK
 from readfish._read_until_client import RUClient
 from readfish._config import Action, Conf, make_decision, _Condition
 from readfish._statistics import ReadfishStatistics
@@ -148,7 +148,7 @@ def __init__(
         logger: logging.Logger,
         debug_log: bool,
         throttle: float = 0.1,
-        unblock_duration: float = 0.5,
+        unblock_duration: float = DEFAULT_UNBLOCK,
         dry_run: bool = False,
         toml: str = "a.toml",
     ):