diff --git a/CHANGELOG.md b/CHANGELOG.md index ec268bb..c5702b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +3.7.1 +----- + +- Require `elasticsearch>=6.3.0,<7.0.0` and `elasticsearch-dsl>=6.2.1,<7.0.0` +- Update for class changes in `elasticsearch-dsl` `6.2.0` + 3.7.0 ----- diff --git a/parsedmarc/__init__.py b/parsedmarc/__init__.py index 0a5c71f..6dcd87a 100644 --- a/parsedmarc/__init__.py +++ b/parsedmarc/__init__.py @@ -43,7 +43,7 @@ import imapclient.exceptions import dateparser import mailparser -__version__ = "3.7.0" +__version__ = "3.7.1" logger = logging.getLogger(__name__) logger.setLevel(logging.INFO) diff --git a/parsedmarc/elastic.py b/parsedmarc/elastic.py index 731db11..d06db68 100644 --- a/parsedmarc/elastic.py +++ b/parsedmarc/elastic.py @@ -38,8 +38,8 @@ class _SPFResult(InnerDoc): class _AggregateReportDoc(DocType): - class Meta: - index = "dmarc_aggregate" + class Index: + name = "dmarc_aggregate" xml_schema = Text() org_name = Text() @@ -134,8 +134,8 @@ class _ForensicSampleDoc(InnerDoc): class _ForensicReportDoc(DocType): - class Meta: - index = "dmarc_forensic" + class Index: + name = "dmarc_forensic" feedback_type = Text() user_agent = Text() diff --git a/requirements.txt b/requirements.txt index 2a40848..7ca2497 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,8 +7,8 @@ dnspython imapclient mail-parser dateparser -elasticsearch -elasticsearch-dsl +elasticsearch>=6.3.0,<7.0.0 +elasticsearch-dsl>=6.2.1,<7.0.0 flake8 sphinx sphinx_rtd_theme diff --git a/setup.py b/setup.py index cc49367..13dd807 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ from setuptools import setup from codecs import open from os import path -__version__ = "3.7.0" +__version__ = "3.7.1" description = "A Python package and CLI for parsing aggregate and " \ "forensic DMARC reports" @@ -93,7 +93,8 @@ setup( # https://packaging.python.org/en/latest/requirements.html install_requires=['dnspython', 'publicsuffix', 'xmltodict', 'geoip2', 'dnspython', 'imapclient', 'mail-parser', 'dateparser', - 'elasticsearch', 'elasticsearch-dsl' + 'elasticsearch>=6.3.0,<7.0.0', + 'elasticsearch-dsl>=6.2.1,<7.0.0' ], entry_points={