Fix evt sample seed handling bug

EVT sampling did not properly handle case where not integer seed is provided.

Author: ctberthiaume

src/seaflowpy/cli/commands/evt_cmd.py

@@ -29,8 +29,13 @@ def validate_positive(ctx, param, value):
 
 
 def validate_seed(ctx, param, value):
-    if value is not None and (value < 0 or value > (2**32 - 1)):
-        raise click.BadParameter('must be between 0 and 2**32 - 1.')
+    if value is not None:
+        try:
+            value = int(value)
+        except ValueError as e:
+            raise click.BadParameter('must be an integer: {}.'.format(e))
+        if (value < 0 or value > (2**32 - 1)):
+            raise click.BadParameter('must be between 0 and 2**32 - 1.')
     return value
 
 
@@ -281,7 +286,7 @@ def beads_evt_cmd(cruise, cytograms, event_limit, frac, iqr, min_date,
     help='Apply noise filter before subsampling.')
 @click.option('-p', '--process-count', type=int, default=1, show_default=True, callback=validate_positive,
     help='Number of processes to use.')
-@click.option('-s', '--seed', type=int, callback=validate_seed,
+@click.option('-s', '--seed', callback=validate_seed,
     help='Integer seed for PRNG, otherwise system-dependent source of randomness is used to seed the PRNG.')
 @click.option('-S', '--sfl', 'sfl_path', type=click.Path(),
     help="""SFL file that can be used to associate dates with EVT files. Useful when

src/seaflowpy/sample.py

@@ -28,8 +28,8 @@ def random_select(things, fraction, seed=None):
     list
         Chosen things.
     """
-    if not isinstance(seed, int):
-        raise ValueError("seed must be an int")
+    if (seed is not None) and not isinstance(seed, int):
+        raise ValueError("seed must be an None or an int")
     if fraction < 0 or fraction > 1:
         raise ValueError("fraction must be between 0 and 1")
 
@@ -286,8 +286,8 @@ def sample_one(df, n, noise_filter=True, min_chl=0, min_fsc=0, min_pe=0, seed=No
             "events_postsampling": event count after subsampling
         }
     """
-    if not isinstance(seed, int):
-        raise ValueError("seed must be an int")
+    if (seed is not None) and not isinstance(seed, int):
+        raise ValueError("seed must be an None or an int")
     if n <= 0:
         raise ValueError("n must be > 0")