From cb63c55b944a78c3b2b0a3e579000dbd44af6025 Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Wed, 31 Jul 2019 11:08:01 -0400 Subject: [PATCH] 6.5.3 --- CHANGELOG.md | 6 ++++++ README.rst | 4 ++-- docs/index.rst | 4 ++-- parsedmarc/__init__.py | 2 +- parsedmarc/cli.py | 6 +++--- setup.py | 4 ++-- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06e926a..6bceac0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +6.5.3 +----- + +- Fix typos in the CLI documentation +- Bump required `mailsuite` version to `1.1.1` + 6.5.2 ----- diff --git a/README.rst b/README.rst index 0ee3170..5577c4c 100644 --- a/README.rst +++ b/README.rst @@ -73,7 +73,7 @@ CLI help optional arguments: -h, --help show this help message and exit -c CONFIG_FILE, --config-file CONFIG_FILE - A path to a configuration file (--silent implied) + a path to a configuration file (--silent implied) --strip-attachment-payloads remove attachment payloads from forensic report output -o OUTPUT, --output OUTPUT @@ -84,7 +84,7 @@ CLI help -t DNS_TIMEOUT, --dns_timeout DNS_TIMEOUT number of seconds to wait for an answer from DNS (default: 2.0) - --offline Do not make online queries for geolocation or DNS + --offline do not make online queries for geolocation or DNS -s, --silent only print errors and warnings --debug print debugging information --log-file LOG_FILE output logging to a file diff --git a/docs/index.rst b/docs/index.rst index 032960e..418c99f 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -77,7 +77,7 @@ CLI help optional arguments: -h, --help show this help message and exit -c CONFIG_FILE, --config-file CONFIG_FILE - A path to a configuration file (--silent implied) + a path to a configuration file (--silent implied) --strip-attachment-payloads remove attachment payloads from forensic report output -o OUTPUT, --output OUTPUT @@ -88,7 +88,7 @@ CLI help -t DNS_TIMEOUT, --dns_timeout DNS_TIMEOUT number of seconds to wait for an answer from DNS (default: 2.0) - --offline Do not make online queries for geolocation or DNS + --offline do not make online queries for geolocation or DNS -s, --silent only print errors and warnings --debug print debugging information --log-file LOG_FILE output logging to a file diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index 9530141..b51d352 100644 --- a/parsedmarc/__init__.py +++ b/parsedmarc/__init__.py @@ -31,7 +31,7 @@ from parsedmarc.utils import is_outlook_msg, convert_outlook_msg from parsedmarc.utils import timestamp_to_human, human_timestamp_to_datetime from parsedmarc.utils import parse_email -__version__ = "6.5.2" +__version__ = "6.5.3" logging.basicConfig( format='%(levelname)8s:%(filename)s:%(lineno)d:' diff --git a/parsedmarc/cli.py b/parsedmarc/cli.py index ead9513..e3ae77c 100644 --- a/parsedmarc/cli.py +++ b/parsedmarc/cli.py @@ -148,7 +148,7 @@ def _main(): arg_parser = ArgumentParser(description="Parses DMARC reports") arg_parser.add_argument("-c", "--config-file", - help="A path to a configuration file " + help="a path to a configuration file " "(--silent implied)") arg_parser.add_argument("file_path", nargs="*", help="one or more paths to aggregate or forensic " @@ -168,7 +168,7 @@ def _main(): type=float, default=2.0) arg_parser.add_argument("--offline", action="store_true", - help="Do not make online queries for geolocation " + help="do not make online queries for geolocation " " or DNS") arg_parser.add_argument("-s", "--silent", action="store_true", help="only print errors and warnings") @@ -592,7 +592,7 @@ def _main(): password=opts.smtp_password, subject=opts.smtp_subject) except Exception as error: - logger.error("S{0}".format(error.__str__())) + logger.error("{0}".format(error.__str__())) exit(1) if opts.imap_host and opts.imap_watch: diff --git a/setup.py b/setup.py index 1f24f59..573528f 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ from setuptools import setup from codecs import open from os import path -__version__ = "6.5.2" +__version__ = "6.5.3" description = "A Python package and CLI for parsing aggregate and " \ "forensic DMARC reports" @@ -97,7 +97,7 @@ setup( 'urllib3<1.25,>=1.21.1', 'requests>=2.2.16.0', 'imapclient>=2.1.0', 'mail-parser>=3.9.2', 'dateparser>=0.7.1', - 'mailsuite>=1.1.0', + 'mailsuite>=1.1.1', 'elasticsearch>=6.3.1,<7.0.0', 'elasticsearch-dsl>=6.3.1,<7.0.0', 'kafka-python>=1.4.4',