issue/161: Fix bug where --subset flag fails with data subscriber (#162)

* fix bug where the subset flag fails for subscriber

* move arg validation to correct spot

CHANGELOG.md

@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 ### Fixed
+- Fixed bug where --subset in combination with the subscriber caused errors
 ### Added
 
 ## [1.15.0]

subscriber/podaac_access.py

@@ -221,13 +221,6 @@ def validate(args):
                          'Please specify exactly one flag '
                          'from -dc, -dy, -dydoy, or -dymd')
 
-    if args.subset and args.search_cycles:
-        # Cycle+Subset are not supported, because Harmony does not
-        # currently accept Cycle.
-        raise ValueError(
-            'Error: Incompatible Parameters. You\'ve provided both cycles and subset, which is '
-            'not allowed. Please provide either cycles or subset separately, but not both.')
-
     if args.subset and args.bbox:
         bounds = list(map(float, args.bbox.split(',')))
         if bounds[0] > bounds[2]:

subscriber/podaac_data_downloader.py

@@ -44,6 +44,13 @@ def validate(args):
     if None in [args.endDate, args.startDate] and args.search_cycles is None and args.granulename is None:
         raise ValueError(
             "Error parsing command line arguments: Both --start-date and --end-date must be specified")  # noqa E50
+    if args.subset and args.search_cycles:
+        # Cycle+Subset are not supported, because Harmony does not
+        # currently accept Cycle.
+        raise ValueError(
+            'Error: Incompatible Parameters. You\'ve provided both cycles and subset, which is '
+            'not allowed. Please provide either cycles or subset separately, but not both.'
+        )
 
 
 def create_parser():