Replace PyInstaller version hack with something better.

This commit is contained in:
Tobias Gruetzmacher 2017-02-14 22:07:52 +01:00
parent abb72a3a24
commit 23dccb184e
2 changed files with 5 additions and 7 deletions

View file

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs
# Copyright (C) 2012-2014 Bastian Kleineidam # 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 Automated comic downloader. Dosage traverses comic websites in
order to download each strip of the comic. The intended use is for 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' 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_info = VersionInfo(AppName)
__version__ = version_info.version_string() # PEP 396 __version__ = version_info.version_string() # PEP 396
AppVersion = version_info.release_string() AppVersion = version_info.release_string()

View file

@ -1,8 +1,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs
# Copyright (C) 2012-2014 Bastian Kleineidam # 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 __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') hiddenimports = collect_submodules('dosagelib.plugins')
datas = copy_metadata('dosage')