diff --git a/dosagelib/__init__.py b/dosagelib/__init__.py index d992561a7..6f22614f7 100644 --- a/dosagelib/__init__.py +++ b/dosagelib/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam -# Copyright (C) 2015-2016 Tobias Gruetzmacher +# Copyright (C) 2015-2017 Tobias Gruetzmacher """ Automated comic downloader. Dosage traverses comic websites in order to download each strip of the comic. The intended use is for @@ -21,10 +21,6 @@ from pbr.version import VersionInfo AppName = u'dosage' -# Workaround for pkg_resources not working inside PyInstaller... -if hasattr(sys, 'frozen'): - os.environ['PBR_VERSION'] = '2.15.0' - version_info = VersionInfo(AppName) __version__ = version_info.version_string() # PEP 396 AppVersion = version_info.release_string() diff --git a/scripts/hook-dosagelib.py b/scripts/hook-dosagelib.py index c1b280e67..f99345ddf 100644 --- a/scripts/hook-dosagelib.py +++ b/scripts/hook-dosagelib.py @@ -1,8 +1,10 @@ # -*- coding: utf-8 -*- # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam -# Copyright (C) 2015-2016 Tobias Gruetzmacher +# Copyright (C) 2015-2017 Tobias Gruetzmacher from __future__ import absolute_import, division, print_function -from PyInstaller.utils.hooks import collect_submodules +from PyInstaller.utils.hooks import collect_submodules, copy_metadata + hiddenimports = collect_submodules('dosagelib.plugins') +datas = copy_metadata('dosage')