From 7f6eae712edc5e0d922601194a80bcd446e8a34b Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Tue, 16 Oct 2018 14:18:44 -0400 Subject: [PATCH] Match requests's urllib3 requirement --- parsedmarc/splunk.py | 2 +- requirements.txt | 1 + setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/parsedmarc/splunk.py b/parsedmarc/splunk.py index 839e468..c317519 100644 --- a/parsedmarc/splunk.py +++ b/parsedmarc/splunk.py @@ -2,8 +2,8 @@ import logging from urllib.parse import urlparse import socket import json -import urllib3 +import urllib3 import requests from parsedmarc.__version__ import __version__ diff --git a/requirements.txt b/requirements.txt index 589b4bc..6791c47 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ dnspython +urllib3<1.24,>=1.21.1 requests publicsuffix xmltodict diff --git a/setup.py b/setup.py index 765f24c..a016a4c 100644 --- a/setup.py +++ b/setup.py @@ -93,7 +93,7 @@ setup( # requirements files see: # https://packaging.python.org/en/latest/requirements.html install_requires=['dnspython', 'publicsuffix', 'xmltodict', 'geoip2', - 'requests', 'imapclient', + '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'