From 2ae500ba9cb2c8d08b5fa0b3dfe24390164cf58d Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Fri, 15 Feb 2019 14:19:52 -0500 Subject: [PATCH] 6.1.1 release --- CHANGELOG.md | 2 ++ parsedmarc/utils.py | 4 ++-- requirements.txt | 25 ++++++++++++------------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7659d63..4d8e4c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ - Fix aggregate report processing - Check for the existence of a configuration file if a path is supplied +- Replace `publicsuffix` with `publicsuffix2` +- Add minimum versions to requirements 6.1.0 ----- diff --git a/parsedmarc/utils.py b/parsedmarc/utils.py index ffef046..adcfd51 100644 --- a/parsedmarc/utils.py +++ b/parsedmarc/utils.py @@ -24,7 +24,7 @@ import dns.exception import geoip2.database import geoip2.errors import requests -import publicsuffix +import publicsuffix2 __version__ = "6.1.1" @@ -110,7 +110,7 @@ def get_base_domain(domain): logger.warning( "Failed to download an updated PSL {0}".format(error)) with open(psl_path, encoding="utf-8") as psl_file: - psl = publicsuffix.PublicSuffixList(psl_file) + psl = publicsuffix2.PublicSuffixList(psl_file) return psl.get_public_suffix(domain) diff --git a/requirements.txt b/requirements.txt index fbf2d96..8e0ff1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,17 +5,16 @@ sphinx_rtd_theme wheel rstcheck>=3.3.1 pygments -dnspython -expiringdict +dnspython>=1.16.0 +expiringdict>=1.1.4 urllib3>=1.21.1 -requests -publicsuffix -xmltodict -geoip2 -dnspython -imapclient -mail-parser -dateparser -elasticsearch -elasticsearch-dsl -kafka-python +requests>=2.2.16.0 +publicsuffix2 +xmltodict>=0.12.0 +geoip2>=2.9.0 +imapclient>=2.1.0 +mail-parser>=3.9.2 +dateparser>=0.7.1 +elasticsearch>=6.3.1 +elasticsearch-dsl>=0.0.12 +kafka-python>=1.4.4