From 9b78cf4913202995dcf065ecf5077bf16fa01f95 Mon Sep 17 00:00:00 2001 From: Todd Leonhardt Date: Fri, 24 Apr 2020 21:15:34 -0400 Subject: Added info on semantic versioning and branching strategy to CONTRIBUTING.md Also: - Added isort to Pipenv dev - Added setup.cfg to make it easy to run flake8, doc8, and isort directly from the command line without using invoke - Ran isort to sort includes --- tests/conftest.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/conftest.py') diff --git a/tests/conftest.py b/tests/conftest.py index 9ee8da19..60074f5c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,7 +3,7 @@ Cmd2 unit/functional testing """ import sys -from contextlib import redirect_stdout, redirect_stderr +from contextlib import redirect_stderr, redirect_stdout from typing import List, Optional, Union from unittest import mock @@ -12,7 +12,6 @@ from pytest import fixture import cmd2 from cmd2.utils import StdSim - # Prefer statically linked gnureadline if available (for macOS compatibility due to issues with libedit) try: import gnureadline as readline -- cgit v1.2.1