From ce4fb80c5739686cd483da1d0bb1d2a46c30bf86 Mon Sep 17 00:00:00 2001 From: "cory.hughes" Date: Fri, 2 Jan 2015 10:14:22 -0600 Subject: [PATCH 1/3] Added urllib3 >= 1.9 to requirements.txt to ensure that disable_warnings is available --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 51dd031..99f9424 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,3 @@ simplejson requests +urllib3>=1.9 From 22e8b4a67e9d0147c586ece5dc465764763e7023 Mon Sep 17 00:00:00 2001 From: "cory.hughes" Date: Fri, 2 Jan 2015 10:23:54 -0600 Subject: [PATCH 2/3] Removed urllib3 dependency (apparently requests embeds libraries) and swapped to the appropriate version of requests --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 99f9424..8557dda 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ simplejson -requests -urllib3>=1.9 +requests>=2.4.0 From 09e92d54199fd370bb2c5ad2a79f81a0afbf599c Mon Sep 17 00:00:00 2001 From: "cory.hughes" Date: Mon, 2 Feb 2015 11:21:59 -0600 Subject: [PATCH 3/3] Fixed setup.py to work with pip 6+ --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a57ec5d..22795ca 100644 --- a/setup.py +++ b/setup.py @@ -20,6 +20,7 @@ from setuptools import setup, find_packages from pip.req import parse_requirements +from pip.download import PipSession def test_python_version(): @@ -32,7 +33,7 @@ def test_python_version(): def load_pip_requirements(fp): reqs, deps = [], [] - for r in parse_requirements(fp): + for r in parse_requirements(fp, session=PipSession()): if r.url is not None: deps.append(str(r.url)) reqs.append(str(r.req))