From 84f7930e3947f866d5bbc453e9d01c30a14da1a1 Mon Sep 17 00:00:00 2001
From: Sean Whalen <whalenster@gmail.com>
Date: Mon, 26 Nov 2018 07:58:26 -0500
Subject: [PATCH] use publicsuffix2

---
 .travis.yml            | 9 +++++++++
 CHANGELOG.md           | 7 +++++++
 parsedmarc/__init__.py | 2 +-
 requirements.txt       | 2 +-
 setup.py               | 8 ++++----
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e4ad8b9..8c16e17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,14 @@ python:
 
 # commands to install dependencies
 before_install:
+  - "sudo apt-get install -y apt-transport-https"
+  - "wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add -"
+  - 'echo "deb https://artifacts.elastic.co/packages/6.x/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-6.x.list'
   - "sudo apt-get update"
+  - "sudo apt-get install -y default-jre-headless elasticsearch"
+  - "sudo systemctl daemon-reload"
+  - "sudo systemctl enable elasticsearch.service"
+  - "sudo service elastsearch start"
   - "sudo apt-get install -y libemail-outlook-message-perl"
 
 install:
@@ -23,5 +30,7 @@ script:
   - "make html"
   - "cd .."
   - "python tests.py"
+  - "parsedmarc --save-aggregate samples/aggregate/*"
+  - "parsedmarc --save-forensic samples/forensic/*"
   - "python setup.py sdist"
   - "python setup.py bdist_wheel"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e97ac6a..05ab56b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+5.0.1
+-----
+
+- Use `publixsuffix2` (closes issue #4)
+- Add Elasticsearch to automated testing
+
+
 5.0.0
 -----
 
diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py
index 7a37e5f..9cb346b 100644
--- a/parsedmarc/__init__.py
+++ b/parsedmarc/__init__.py
@@ -38,7 +38,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__ = "5.0.0"
+__version__ = "5.0.1"
 
 logger = logging.getLogger("parsedmarc")
 logger.debug("parsedmarc v{0}".format(__version__))
diff --git a/requirements.txt b/requirements.txt
index 5e6d1e1..998d1b8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ dnspython
 expiringdict
 urllib3<1.24,>=1.21.1
 requests
-publicsuffix
+publicsuffix2
 xmltodict
 geoip2
 dnspython
diff --git a/setup.py b/setup.py
index 20ff156..1009cc2 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ from setuptools import setup
 from codecs import open
 from os import path
 
-__version__ = "5.0.0"
+__version__ = "5.0.1"
 
 description = "A Python package and CLI for parsing aggregate and " \
               "forensic DMARC reports"
@@ -92,9 +92,9 @@ setup(
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=['dnspython', 'expiringdict', 'publicsuffix', 'xmltodict',
-                      'geoip2', 'urllib3<1.24,>=1.21.1', 'requests',
-                      'imapclient', 'mail-parser', 'dateparser',
+    install_requires=['dnspython', 'expiringdict', 'publicsuffix2',
+                      'xmltodict', 'geoip2', 'urllib3<1.24,>=1.21.1',
+                      'requests', 'imapclient', 'mail-parser', 'dateparser',
                       'elasticsearch>=6.3.0,<7.0.0',
                       'elasticsearch-dsl>=6.2.1,<7.0.0', 'kafka-python'
                       ],