update requirements against GH packages as explained by

https://caremad.io/2013/07/setup-vs-requirement/

diff --git a/requirements.txt b/requirements.txt
index 897fb90ec90c03ac51b9f09cb4a0c340e2973285..232a6afc997099e2270fe163432085f6782b8e9f 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,6 @@
+--index-url https://pypi.python.org/simple/
+
 setuptools
--e .
\ No newline at end of file
+-e .
+-e https://github.com/mariocesar/sorl-thumbnail/tarball/master#egg=sorl-thumbnail-12.2
+-e https://github.com/django-haystack/django-haystack/tarball/master#egg=django-haystack-2.4
\ No newline at end of file

diff --git a/setup.py b/setup.py
index e1bf79225e1ba567307e2e8889b675d1a1223d4b..6e9eb4a62fba2ea422f4e029965a12026887f5e6 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,6 @@ setup(
         'django-google-tools',
         'django-ipauth',
         'django-celery',
-        # 'django-haystack',
         'timeside>=0.7',
         'south',
         'docutils',
@@ -76,9 +75,6 @@ setup(
         'ebooklib',
     ],
   tests_require=['pytest-django', 'pytest-cov', 'factory-boy'],
-  dependency_links = ['https://github.com/mariocesar/sorl-thumbnail/tarball/master#egg=sorl-thumbnail-12.2',
-                      'https://github.com/django-haystack/django-haystack/tarball/master#egg=django-haystack-2.4',
-                      ],
   # Provide a test command through django-setuptest
   cmdclass={'test': PyTest},
   platforms=['OS Independent'],