From 010f1f84a77e2c79f711a0bd8983bed55b7b490a Mon Sep 17 00:00:00 2001
From: Sean Whalen <seanthegeek@users.noreply.github.com>
Date: Thu, 9 Jan 2025 22:22:55 -0500
Subject: [PATCH] 8.17.0

- Ignore duplicate aggregate DMARC reports with the same `org_name` and `report_id` seen within the same hour ([#539](https://github.com/domainaware/parsedmarc/issues/539))
- Fix saving SMTP TLS reports to OpenSearch (PR #585 closed issue #576)
- Add 303 entries to `base_reverse_dns_map.csv`
---
 CHANGELOG.md           | 9 ++++++++-
 parsedmarc/__init__.py | 5 ++---
 sortmaps.py            | 1 -
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d1ecae..d74c7f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,17 @@
 Changelog
 =========
 
+8.17.0
+------
+
+- Ignore duplicate aggregate DMARC reports with the same `org_name` and `report_id` seen within the same hour ([#539](https://github.com/domainaware/parsedmarc/issues/539))
+- Fix saving SMTP TLS reports to OpenSearch (PR #585 closed issue #576)
+- Add 303 entries to `base_reverse_dns_map.csv`
+
 8.16.1
 ------
 
-- Ignore aggregate DMARC reports seen within a period of one hour (#535)
+- Failed attempt to ignore aggregate DMARC reports seen within a period of one hour (#535)
 
 8.16.0
 ------
diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py
index a1fe26f..b3165d8 100644
--- a/parsedmarc/__init__.py
+++ b/parsedmarc/__init__.py
@@ -39,7 +39,7 @@ from parsedmarc.utils import is_outlook_msg, convert_outlook_msg
 from parsedmarc.utils import parse_email
 from parsedmarc.utils import timestamp_to_human, human_timestamp_to_datetime
 
-__version__ = "8.16.1"
+__version__ = "8.17.0"
 
 logger.debug("parsedmarc v{0}".format(__version__))
 
@@ -1666,8 +1666,7 @@ def get_dmarc_reports_from_mailbox(
                     aggregate_reports.append(parsed_email["report"])
                 else:
                     logger.debug(
-                        "Skipping duplicate aggregate report "
-                        f"with ID: {report_id}"
+                        "Skipping duplicate aggregate report " f"with ID: {report_id}"
                     )
                 aggregate_report_msg_uids.append(msg_uid)
             elif parsed_email["report_type"] == "forensic":
diff --git a/sortmaps.py b/sortmaps.py
index e77ceef..880da97 100755
--- a/sortmaps.py
+++ b/sortmaps.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 import os
-import sys
 import glob
 import csv