From ce7655ec8f931cd31acc6f0443f0050b6bc2df3d Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Thu, 11 Apr 2019 16:01:44 -0400 Subject: [PATCH] Fix deps --- .travis.yml | 2 +- requirements.txt | 4 ++-- setup.py | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 169daf9..02f0116 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ python: before_install: - "sudo apt-get update" - "sudo apt-get install -y libemail-outlook-message-perl" - - "curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.0.0.deb && sudo dpkg -i --force-confnew elasticsearch-67.0.0.deb && sudo service elasticsearch restart" + - "curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.0.0.deb && sudo dpkg -i --force-confnew elasticsearch-7.0.0.deb && sudo service elasticsearch restart" install: - "pip install -r requirements.txt" diff --git a/requirements.txt b/requirements.txt index 1c5d629..6a01359 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,6 +17,6 @@ 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 +elasticsearch>=6.3.1<7.0.0 +elasticsearch-dsl>=6.3.1<7.0.0 kafka-python>=1.4.4 \ No newline at end of file diff --git a/setup.py b/setup.py index f63ed53..44d5699 100644 --- a/setup.py +++ b/setup.py @@ -96,8 +96,10 @@ setup( 'publicsuffix2', 'xmltodict>=0.12.0', 'geoip2>=2.9.0', 'urllib3>=1.21.1', 'requests>=2.2.16.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', + 'dateparser>=0.7.1', + 'elasticsearch>=6.3.1<7.0.0', + 'elasticsearch-dsl>=6.3.1,<7.0.0', + 'kafka-python>=1.4.4', 'tqdm>=4.31.1' ],