From 5d1648e1edfcbe1502fb935c23e7d47adb2bf754 Mon Sep 17 00:00:00 2001 From: mike-gangl <59702631+mike-gangl@users.noreply.github.com> Date: Tue, 1 Feb 2022 16:48:22 -0800 Subject: [PATCH] 1.7.2 merge into develop (#43) * Don't consume all arguments after --extensions This behavior is now more like other utilities where specifying the flag multiple times extends the value of the argument. For example, -e '.nc .h5 .zip' becomes -e '.nc' -e '.h5' -e '.zip' This is less fragile for the user and possibly less confusing how the argument should be formatted on the command line. * Add ability to execute arbitrary commands on each downloaded file I did it this way so each file could be compressed without hard-coding the compression algorithm. But I could see this being used to run a pre-processing script on each downloaded file. * updated README and tests for additive -e examples * force 'action' * merged code for extensions, process call, and updated documentation * fix for https://github.com/podaac/data-subscriber/issues/28 * updated CHANGELOG * Issue 33 (#35) * Develop (#32) * Don't consume all arguments after --extensions This behavior is now more like other utilities where specifying the flag multiple times extends the value of the argument. For example, -e '.nc .h5 .zip' becomes -e '.nc' -e '.h5' -e '.zip' This is less fragile for the user and possibly less confusing how the argument should be formatted on the command line. * Add ability to execute arbitrary commands on each downloaded file I did it this way so each file could be compressed without hard-coding the compression algorithm. But I could see this being used to run a pre-processing script on each downloaded file. * updated README and tests for additive -e examples * force 'action' * merged code for extensions, process call, and updated documentation * fix for https://github.com/podaac/data-subscriber/issues/28 * updated CHANGELOG Co-authored-by: Joe Sapp Co-authored-by: mgangl * closes #33 added 'files to download' to non-verbose output * updated changelog Co-authored-by: Joe Sapp Co-authored-by: mgangl * updated changelog to reflect accurate versions released * version bump for master delivery Co-authored-by: Joe Sapp Co-authored-by: mgangl --- CHANGELOG.md | 19 +++++++++++++++++++ setup.py | 2 +- subscriber/podaac_data_subscriber.py | 7 +++++-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f3d579..21789a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,25 @@ 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/) + +## Unreleased +### Added +### Changed +- Made number of files to download a non-verbose default printout. [33](https://github.com/podaac/data-subscriber/issues/33) +### Deprecated +### Removed +### Fixed +### Security + +## [1.7.2] +### Added +### Changed +- Made number of files to download a non-verbose default printout. [33](https://github.com/podaac/data-subscriber/issues/33) +### Deprecated +### Removed +### Fixed +### Security + ## [1.7.1] ### Added - Auto build and deploy to pypi on tag/release. diff --git a/setup.py b/setup.py index ecfa66d..a694654 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ long_description = fh.read() setup(name='podaac-data-subscriber', - version='1.7.1', + version='1.7.2', description='PO.DAAC Data Susbcriber Command Line Tool', url='https://github.com/podaac/data-subscriber', long_description=long_description, diff --git a/subscriber/podaac_data_subscriber.py b/subscriber/podaac_data_subscriber.py index b988d5d..e2bbc43 100755 --- a/subscriber/podaac_data_subscriber.py +++ b/subscriber/podaac_data_subscriber.py @@ -30,7 +30,7 @@ from urllib.request import urlopen, urlretrieve from datetime import datetime, timedelta -__version__ = "1.7.1" +__version__ = "1.7.2" LOGLEVEL = os.environ.get('SUBSCRIBER_LOGLEVEL', 'WARNING').upper() logging.basicConfig(level=LOGLEVEL) @@ -401,8 +401,11 @@ def run(): downloads = filtered_downloads + # https://github.com/podaac/data-subscriber/issues/33 + # Make this a non-verbose message + #if args.verbose: + print("Found " + str(len(downloads)) + " total files to download") if args.verbose: - print("Found " + str(len(downloads)) + " total files to download") print("Downloading files with extensions: " + str(extensions))