Skip to content

Commit

Permalink
Merge 12a7e8c into 162aeaa
Browse files Browse the repository at this point in the history
  • Loading branch information
jmathai committed Jun 22, 2016
2 parents 162aeaa + 12a7e8c commit eb8787e
Show file tree
Hide file tree
Showing 13 changed files with 851 additions and 598 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ virtualenv:
system_site_packages: true
before_install:
- "sudo apt-get update -qq"
- "sudo apt-get install python-dev python-pip python-pyexiv2 libimage-exiftool-perl -y"
- "sudo apt-get install python-dev python-pip libimage-exiftool-perl -y"
install:
- "sudo pip install -r elodie/tests/requirements.txt"
- "sudo pip install coveralls"
Expand Down
17 changes: 0 additions & 17 deletions elodie/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,6 @@
https://github.com/jmathai/elodie#install-everything-you-need
""".lstrip()

#: Template for the error to print when pyexiv2 can't be found.
PYEXIV2_ERROR = u"""
{error_class_name}: {error}
It looks like you don't have pyexiv2 installed, which Elodie requires for
geolocation. Please take a look at the installation steps in the readme:
https://github.com/jmathai/elodie#install-everything-you-need
""".lstrip()


def get_exiftool():
"""Get path to executable exiftool binary.
Expand Down Expand Up @@ -56,11 +46,4 @@ def verify_dependencies():
print >>sys.stderr, EXIFTOOL_ERROR
return False

try:
import pyexiv2 # noqa
except ImportError as e:
print >>sys.stderr, PYEXIV2_ERROR.format(
error_class_name=e.__class__.__name__, error=e)
return False

return True
Empty file added elodie/external/__init__.py
Empty file.

0 comments on commit eb8787e

Please sign in to comment.