Install ExifRead from GitHub on Python 3.

diff --git a/setup.py b/setup.py
index a644a3c3f57ec0129832fc4c17cbd6b3bf1dcfe7..6773437ef9a1214e705958ef8d0d961fa831427b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -53,6 +53,8 @@ if PY2:
     # # their next release.
     # py2_only_install_requires.append('pbr==0.5.22')
     py2_only_install_requires.append('mock')  # mock is in the stdlib for 3.3+
+    # PyPI version (1.4.2) does not have proper Python 3 support
+    py2_only_install_requires.append('ExifRead')
 
 install_requires = [
     'gunicorn',
@@ -79,7 +81,6 @@ install_requires = [
     'oauthlib',
     'unidecode',
     'jsonschema',
-    'ExifRead',  # TODO(berker): Install develop branch for Python 3
     'PasteDeploy',
     'requests',
     'pyld',
@@ -91,6 +92,12 @@ install_requires = [
     # 'Pillow',
 ] + py2_only_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:
     long_description = fobj.read()
 
@@ -103,6 +110,7 @@ try:
     include_package_data = True,
     # scripts and dependencies
     install_requires=install_requires,
+    dependency_links=dependency_links,
     test_suite='nose.collector',
     entry_points="""\
         [console_scripts]

diff --git a/tox.ini b/tox.ini
index 7931ca12f42ebba52a9581257dc054b443e4d917..023c53ed7a9259fd15a10c2608e0fe12511a7217 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -5,11 +5,9 @@ sitepackages = False
 
 [testenv]
 usedevelop = True
-whitelist_externals = sh
+# for ExifRead 2.0.0
+install_command = pip install --process-dependency-links --pre {opts} {packages}
 commands = py.test ./mediagoblin/tests --boxed
 deps =
  lxml
  Pillow
- # exif-py 1.4.2 does not yet have proper py3 support,
- # so for now...
- git+https://github.com/ianare/exif-py.git@develop