# HG changeset patch
# User Branko Majic <branko@majic.rs>
# Date 2013-06-30 20:44:30
# Node ID 02854259070b923353b721dd77cfc4009db4b65b
# Parent  650f55ded2451468484ea0d08a1545b6400cfbb3

Fixed the setup script. Updated instructions with new URL, and updating of pip (to work around a bug).

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -19,14 +19,14 @@ Create the virtual environment for testi
 
   mkvirtualenv conntrackt
 
-Install the Django Conntrackt requirements::
+Install the latest version of pip (that contains fix for parsing the requirement files)::
+
+  pip install -U pip
+
+Install Django Conntrackt with its requirements::
 
   workon conntrackt
-  pip install django
-
-Install Django Conntrackt::
-
-  pip install -e hg+https://hg.majic.rs/conntrackt#egg=conntrackt
+  pip install -e hg+http://code.majic.rs/conntrackt#egg=conntrackt
 
 Start a new Django Conntrackt project::
 
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -3,8 +3,8 @@ from setuptools import setup
 from pip.req import parse_requirements
 
 README = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
-INSTALL_REQUIREMENTS = [r.req for r in parse_requirements("requirements/production.txt")]
-TEST_REQUIREMENTS = [r.req for r in parse_requirements("requirements/test.txt")]
+INSTALL_REQUIREMENTS = [str(r.req) for r in parse_requirements("requirements/production.txt")]
+TEST_REQUIREMENTS = [str(r.req) for r in parse_requirements("requirements/test.txt")]
 
 # allow setup.py to be run from any path
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
@@ -21,7 +21,7 @@ setup(
     author='Branko Majic',
     author_email='branko@majic.rs',
     install_requires=INSTALL_REQUIREMENTS,
-    tests_requires=TEST_REQUIREMENTS,
+    tests_require=TEST_REQUIREMENTS,
     classifiers=[
         'Environment :: Web Environment',
         'Framework :: Django',