Merge pull request #88 from twidi/future-14.3

Use future==14.3 (and bump to 0.2.1)

Fixed #87

.travis.yml

@@ -4,7 +4,7 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
-install: "pip install --process-dependency-links ."
+install: "pip install ."
 script: "python run_tests.py"
 services:
   - redis-server

CHANGELOG

@@ -1,3 +1,7 @@
+V 0.2.1  2015-01-12
+
+    * Stop using dev version of "future"
+
 V 0.2.0  2014-09-07
 
     * Adding support for python 3.3 and 3.4

README.rst

@@ -70,10 +70,7 @@ Python 2.6, 2.7, 3.3 and 3.4 are supported.
 
 .. code:: bash
 
-    pip install --process-dependency-links redis-limpyd
-
-
-Note: the `process-dependency-links` is currently required to use a development version of future which correct a bug we suffered from.
+    pip install redis-limpyd
 
 
 Documentation

doc/about.rst

@@ -19,10 +19,8 @@ Python 2.6, 2.7, 3.3 and 3.4 are supported.
 
 .. code:: bash
 
-    pip install --process-dependency-links redis-limpyd
+    pip install redis-limpyd
 
 
-Note: the `process-dependency-links` is currently required to use a development version of future which correct a bug we suffered from.
-
 
 .. _Redis: http://redis.io

requirements.txt

@@ -1,4 +1,2 @@
 redis==2.9.1
-#future==0.13.0
-# waiting for https://github.com/PythonCharmers/python-future/commit/f905bd893ef7b6bd9d3edc863a916a7ce0dfc47a
-https://github.com/PythonCharmers/python-future/tarball/v0.13.x#egg=future==0.13.dev
+future==0.14.3

setup.py

@@ -10,29 +10,14 @@
 
 
 def get_requirements(source):
-    """
-    Get the path of a requirements file and return a dict with:
-      - `packages`: the list of all packages to install, in the format `name==version`
-                    to be used in the `install_requires` argument of setup()
-      - `links`: a list of urls to use as links in the `dependency_links` argument
-                 of setup(), in th format `url#egg=name-version, BUT in the
-                 requirements file, the link MUST be set in the format `url#egg=name==version`
-                 (note the `==` required in the requirements file.)
-                 The == is used to get the package name+version to put in `packages`,
-                 but to process the dependency, pip expect a `-`, not `==`
-
-    """
-    install_reqs = list(parse_requirements(source))
-    return {
-        'packages': [str(ir.req) for ir in install_reqs],
-        'links': ['%s#egg=%s' % (ir.url, str(ir.req).replace('==', '-')) for ir in install_reqs if ir.url],
-    }
+    install_reqs = parse_requirements(source)
+    return set([str(ir.req) for ir in install_reqs])
 
 
 if sys.version_info >= (2, 7):
-    requirements = get_requirements('requirements.txt')
+    install_requires = get_requirements('requirements.txt'),
 else:
-    requirements = get_requirements('requirements-2.6.txt')
+    install_requires = get_requirements('requirements-2.6.txt'),
 
 
 long_description = codecs.open('README.rst', "r", "utf-8").read()
@@ -48,8 +33,7 @@ def get_requirements(source):
     download_url = "https://github.com/yohanboniface/redis-limpyd/tags",
     packages = find_packages(exclude=["tests.*", "tests"]),
     include_package_data=True,
-    install_requires=requirements['packages'],
-    dependency_links=requirements['links'],
+    install_requires=install_requires,
     platforms=["any"],
     zip_safe=True,