Merge branch 'master' into 'multiple-qualities-backend'

RabbitMQ addition in master

See merge request !1

1 files changed, 2 insertions, 5 deletions

diff --git a/setup.py b/setup.py
index 6d309f7e..72c19735 100644
--- a/setup.py
+++ b/setup.py
@@ -56,8 +56,7 @@ install_requires = [
     'pytest>=2.3.1',
     'pytest-xdist',
     'werkzeug>=0.7',
-    'celery>=3.0,<4.0a0',
-    'kombu<4.0a0',
+    'celery>=3.0',
     'jinja2',
     'Babel>=1.3',
     'WebTest>=2.0.18',
@@ -75,6 +74,7 @@ install_requires = [
     'PasteScript',
     'requests>=2.6.0',
     'pyld',
+    'ExifRead>=2.0.0'
     # This is optional:
     # 'translitcodec',
     # For now we're expecting that users will install this from
@@ -83,10 +83,8 @@ install_requires = [
     # 'Pillow',
 ] + pyversion_install_requires
 
-dependency_links = []
 if not PY2:
     # PyPI version (1.4.2) does not have proper Python 3 support
-    dependency_links.append('https://github.com/ianare/exif-py/zipball/develop#egg=ExifRead-2.0.0')
     install_requires.append('ExifRead>=2.0.0')
 
 with open(READMEFILE, encoding="utf-8") as fobj:
@@ -101,7 +99,6 @@ try:
     include_package_data = True,
     # scripts and dependencies
     install_requires=install_requires,
-    dependency_links=dependency_links,
     test_suite='nose.collector',
     entry_points="""\
         [console_scripts]