From 47b2f98abebeef982720674d0c912e0367042e4a Mon Sep 17 00:00:00 2001 From: Bjoern Gruening Date: Fri, 21 Aug 2020 23:18:55 +0200 Subject: [PATCH] fix UTF-8 issue --- .circleci/config.yml | 2 ++ lib/galaxy/datatypes/media.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 74ed97e0029..f60ba79b43b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -139,6 +139,8 @@ jobs: steps: - *restore_repo_cache - *install_tox + - *install_wave + - *install_ffprobe - run: tox -e test_galaxy_packages js_unit: docker: diff --git a/lib/galaxy/datatypes/media.py b/lib/galaxy/datatypes/media.py index c5bb13fb563..901949be9c3 100644 --- a/lib/galaxy/datatypes/media.py +++ b/lib/galaxy/datatypes/media.py @@ -12,7 +12,7 @@ from galaxy.util import which def ffprobe(path): - data = json.loads(subprocess.check_output(['ffprobe', '-loglevel', 'quiet', '-show_format', '-show_streams', '-of', 'json', path])) + data = json.loads(subprocess.check_output(['ffprobe', '-loglevel', 'quiet', '-show_format', '-show_streams', '-of', 'json', path]).decode("utf-8")) return data['format'], data['streams']