Release/1.15.1 (#166)

* initial implementaiton of subset code * added tests, more updates * removed skip_errors (not implemented yet) * Upgrade to harmony-py 0.4.9 * subsetting capability initial commit * update spacing * Update docs * update poetry lock * upgrade to poetry 1.5.1 (latest) * fix failing checksum test * fixed regression test issues * bump poetry version in second gh action file * Update poetry version to fix build issue * bump poetry version * bump poetry version * bump version to 1.15.0 * bump version to 1.15.0 * add unreleased section to changelog * 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 * bump version * bump version * Issue/164: Upgrade harmony-py to avoid 413 request entity too large issue (#165) * bump harmony-py version to 0.4.12 * /version 1.15.1-alpha.2 --------- Co-authored-by: mike-gangl <[email protected]>
podaac · Mar 20, 2024 · c17944e · c17944e
1 parent 3ee78a4
commit c17944e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+## [1.15.1]
+### Fixed
+- Fixed bug where --subset in combination with the subscriber caused errors
+### Added
+
 ## [1.15.0]
 ### Added
 - Added support for Harmony subsetting

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "podaac-data-subscriber"
-version = "1.15.0"
+version = "1.15.1-alpha.2"
 description = "PO.DAAC Data Subscriber Command Line Tool"
 authors = ["PO.DAAC <[email protected]>"]
 readme = "README.md"
@@ -16,7 +16,7 @@ python = "^3.7"
 requests = "^2.27.1"
 tenacity = "^8.0.1"
 packaging = "^23.0"
-harmony-py = "^0.4.9"
+harmony-py = "^0.4.12"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.1.2"

diff --git a/subscriber/podaac_access.py b/subscriber/podaac_access.py
@@ -26,7 +26,7 @@
 import tenacity
 from datetime import datetime
 
-__version__ = "1.15.0"
+__version__ = "1.15.1"
 extensions = ["\\.nc", "\\.h5", "\\.zip", "\\.tar.gz", "\\.tiff"]
 edl = "urs.earthdata.nasa.gov"
 cmr = "cmr.earthdata.nasa.gov"
@@ -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]:

diff --git a/subscriber/podaac_data_downloader.py b/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():