Skip to content

Commit

Permalink
Merge branch 'hotfix/1.4.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
vmalloc committed Sep 20, 2017
2 parents 8032464 + b773d46 commit b1307ed
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
6 changes: 6 additions & 0 deletions doc/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog
=========

* :bug:`679 major` Fix coloring console for non TTY stdout
* :feature:`675` Emit native python warnings for logbook warning level
* :feature:`661` Support PDB notifications by notifications plugin
* :feature:`660` Add configuration for notifications plugin ``--notify-only-on-failure``
* :feature:`662` Change email notification icon based on session success status
* :release:`1.4.3 <14-9-2017>`
* :bug:`670` Improve handling of interruption exceptions - custom interruption exceptions will now properly cause the session and test to trigger the ``session_interrupt`` and ``test_interrupt`` hooks. Unexpected exceptions like ``SystemExit`` from within tests are now also reported properly instead of silently ignored
* :bug:`668` Properly initialize colorama under Windows
* :bug:`665` Support overriding notifications plugin's ``from_email`` by configuration
Expand Down
8 changes: 6 additions & 2 deletions slash/frontend/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import colorama
import logbook # pylint: disable=F0401
import sys
import os

from ..__version__ import __version__

Expand Down Expand Up @@ -62,11 +63,14 @@ def _setup_logging_context(args):

#### For use with entry_points/console_scripts
def main_entry_point():
colorama.init()
is_windows = os.name == 'nt'
if is_windows:
colorama.init()
try:
sys.exit(main())
finally:
colorama.deinit()
if is_windows:
colorama.deinit()

if __name__ == "__main__":
main_entry_point()

0 comments on commit b1307ed

Please sign in to comment.