Skip to content

Commit

Permalink
add jmes filter into dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
wjo1212 committed Dec 16, 2018
1 parent 0654fd5 commit b145090
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 11 deletions.
3 changes: 2 additions & 1 deletion requirements-py2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ enum34
python-dateutil
# Elasticsearch 6.x
elasticsearch>=6.0.0,<7.0.0
dateparser
dateparser
jmespath
3 changes: 2 additions & 1 deletion requirements-py26.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ futures
enum34
python-dateutil
# Elasticsearch 6.x
elasticsearch>=6.0.0,<7.0.0
elasticsearch>=6.0.0,<7.0.0
jmespath
1 change: 1 addition & 0 deletions requirements-py3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ python-dateutil
# Elasticsearch 6.x
elasticsearch>=6.0.0,<7.0.0
dateparser
jmespath
18 changes: 9 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@
import sys
import re

install_requires_common = ['requests', 'six', 'python-dateutil', 'elasticsearch>=6.0.0,<7.0.0', 'jmespath']
install_requires = []

if sys.version_info[:2] == (2, 6):
install_requires = ['requests', 'protobuf <= 3.4.0', 'six', 'enum34', 'futures', 'python-dateutil',
'elasticsearch>=6.0.0,<7.0.0']
install_requires = [ 'protobuf <= 3.4.0', 'enum34', 'futures' ]
elif sys.version_info[0] == 2:
install_requires = ['requests', 'protobuf>=3.4.0', 'six', 'enum34', 'futures', 'python-dateutil',
'elasticsearch>=6.0.0,<7.0.0',
'dateparser']
install_requires = ['protobuf>=3.4.0', 'enum34', 'futures', 'dateparser']
elif sys.version_info[:2] == (3, 3):
install_requires = ['requests', 'protobuf>=3.4.0', 'six', 'enum34', 'python-dateutil', 'elasticsearch>=6.0.0,<7.0.0',
'dateparser']
install_requires = ['protobuf>=3.4.0', 'enum34', 'dateparser']
elif sys.version_info[0] == 3:
install_requires = ['requests', 'protobuf>=3.4.0', 'six', 'python-dateutil', 'elasticsearch>=6.0.0,<7.0.0',
'dateparser']
install_requires = ['protobuf>=3.4.0', 'dateparser']

install_requires.extend(install_requires_common)

packages = [
'aliyun',
Expand Down

0 comments on commit b145090

Please sign in to comment.