Merge pull request #90 from twidi/master

Compatibility with pip>=6
limpyd · Jun 12, 2015 · 27c90a8 · 27c90a8
2 parents ac3511b + edf02fe
commit 27c90a8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+V 0.2.2  2015-06-12
+
+    * Compatibility with pip 6+
+
 V 0.2.1  2015-01-12
 
     * Stop using dev version of "future"
@@ -20,4 +24,4 @@ V 0.1.1  2013-08-26
 
 V 0.1.0  2013-02-12
 
-    * First public version
+    * First public version
diff --git a/limpyd/__init__.py b/limpyd/__init__.py
@@ -2,7 +2,7 @@
 power and the control of the Redis API, in a limpid way, with just as
 abstraction as needed."""
 
-VERSION = (0, 2, 1)
+VERSION = (0, 2, 2)
 
 __author__ = 'Yohan Boniface'
 __contact__ = "[email protected]"

diff --git a/setup.py b/setup.py
@@ -8,9 +8,18 @@
 
 import limpyd
 
+# The `session` argument for the `parse_requirements` function is available (but
+# optional) in pip 1.5, and mandatory in next versions
+try:
+    from pip.download import PipSession
+except ImportError:
+    parse_args = {}
+else:
+    parse_args = {'session': PipSession()}
+
 
 def get_requirements(source):
-    install_reqs = parse_requirements(source)
+    install_reqs = parse_requirements(source, **parse_args)
     return set([str(ir.req) for ir in install_reqs])