From a61998daa70d07db6da9c23bac54032c5561c20e Mon Sep 17 00:00:00 2001 From: Spencer McIntyre Date: Thu, 19 Feb 2015 16:12:28 -0500 Subject: [PATCH] Set the version to 0.1.7 final --- king_phisher/client/graphs.py | 3 ++- king_phisher/version.py | 2 +- tests/utilities.py | 2 +- tools/cx_freeze.py | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/king_phisher/client/graphs.py b/king_phisher/client/graphs.py index 927c9992..a03c5f78 100644 --- a/king_phisher/client/graphs.py +++ b/king_phisher/client/graphs.py @@ -31,6 +31,7 @@ # import datetime +import sys from king_phisher import ua_parser from king_phisher import utilities @@ -50,7 +51,7 @@ has_matplotlib = False """Whether the :py:mod:`matplotlib` module is available.""" else: - if utilities.check_requirements(['matplotlib>=1.4.1']): + if not getattr(sys, 'frozen', False) and utilities.check_requirements(['matplotlib>=1.4.1']): has_matplotlib = False else: has_matplotlib = True diff --git a/king_phisher/version.py b/king_phisher/version.py index 08ef2081..0ccca649 100644 --- a/king_phisher/version.py +++ b/king_phisher/version.py @@ -35,7 +35,7 @@ version_info = collections.namedtuple('version_info', ['major', 'minor', 'micro'])(0, 1, 7) """A tuple representing the version information in the format ('major', 'minor', 'micro')""" -version_label = 'beta' +version_label = '' """A version lable such as alpha or beta.""" version = "{0}.{1}.{2}".format(version_info.major, version_info.minor, version_info.micro) """A string representing the full version information.""" diff --git a/tests/utilities.py b/tests/utilities.py index 35d37f3a..8dfeed5f 100644 --- a/tests/utilities.py +++ b/tests/utilities.py @@ -36,7 +36,7 @@ from king_phisher import testing from king_phisher.utilities import * -SINGLE_QUOTE_STRING_ESCAPED = """C:\\\\Users\\\\Alice\\\\Desktop\\\\Alice\\\'s Secret File.txt""" +SINGLE_QUOTE_STRING_ESCAPED = """C:\\\\Users\\\\Alice\\\\Desktop\\\\Alice\\'s Secret File.txt""" SINGLE_QUOTE_STRING_UNESCAPED = """C:\\Users\\Alice\\Desktop\\Alice's Secret File.txt""" # function used for testing the cache object diff --git a/tools/cx_freeze.py b/tools/cx_freeze.py index 09091702..28c592ed 100644 --- a/tools/cx_freeze.py +++ b/tools/cx_freeze.py @@ -127,7 +127,7 @@ build_exe_options = dict( compressed=False, - packages=['email', 'gi', 'jinja2', 'matplotlib', 'msgpack', 'paramiko'], + packages=['cairo', 'email', 'gi', 'jinja2', 'matplotlib', 'msgpack', 'paramiko'], include_files=include_files )