From e313ddb721cf7885809a749cdd3e7ae5af482f16 Mon Sep 17 00:00:00 2001
From: jvoisin <julien.voisin@dustri.org>
Date: Sun, 25 Mar 2018 17:42:29 +0200
Subject: [PATCH] Add gitlab-ci
---
.gitlab-ci.yml | 5 +++++
src/parsers/jpg.py | 2 +-
src/parsers/png.py | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
create mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..2bbe472
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,5 @@
+test:
+ script:
+ - apt-get update -qy
+ - apt-get install -qy --no-install-recommends python3-mutagen python3-gi-cairo gir1.2-poppler-0.18 gir1.2-gdkpixbuf-2.0 libimage-exiftool-perl
+ - python3 -m unittest discover -v
diff --git a/src/parsers/jpg.py b/src/parsers/jpg.py
index d1a4439..34fc04c 100644
--- a/src/parsers/jpg.py
+++ b/src/parsers/jpg.py
@@ -19,7 +19,7 @@ class JPGParser(abstract.AbstractParser):
def get_meta(self):
out = subprocess.check_output(['exiftool', '-json', self.filename])
- meta = json.loads(out)[0]
+ meta = json.loads(out.decode('utf-8'))[0]
for key in self.meta_whitelist:
meta.pop(key, None)
return meta
diff --git a/src/parsers/png.py b/src/parsers/png.py
index 20cd234..377682e 100644
--- a/src/parsers/png.py
+++ b/src/parsers/png.py
@@ -16,7 +16,7 @@ class PNGParser(abstract.AbstractParser):
def get_meta(self):
out = subprocess.check_output(['exiftool', '-json', self.filename])
- meta = json.loads(out)[0]
+ meta = json.loads(out.decode('utf-8'))[0]
for key in self.meta_whitelist:
meta.pop(key, None)
return meta
--
GitLab