From 9c69bd4f29fdf07b79f1a49c7a3ff0eba1a78bce Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Tue, 22 Nov 2016 16:25:13 -0500 Subject: Install pytest in the main venv --- igor.py | 6 ++---- requirements/dev.pip | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/igor.py b/igor.py index 88093826..5eed9bb9 100644 --- a/igor.py +++ b/igor.py @@ -20,6 +20,8 @@ import textwrap import warnings import zipfile +import pytest + # We want to see all warnings while we are running tests. But we also need to # disable warnings for some of the more complex setting up of tests. warnings.simplefilter("default") @@ -95,8 +97,6 @@ def should_skip(tracer): def run_tests(tracer, *runner_args): """The actual running of tests.""" - import pytest - if 'COVERAGE_TESTING' not in os.environ: os.environ['COVERAGE_TESTING'] = "True" print_banner(label_for_tracer(tracer)) @@ -105,8 +105,6 @@ def run_tests(tracer, *runner_args): def run_tests_with_coverage(tracer, *runner_args): """Run tests, but with coverage.""" - import pytest - # Need to define this early enough that the first import of env.py sees it. os.environ['COVERAGE_TESTING'] = "True" os.environ['COVERAGE_PROCESS_START'] = os.path.abspath('metacov.ini') diff --git a/requirements/dev.pip b/requirements/dev.pip index 9da0d694..6a8724f9 100644 --- a/requirements/dev.pip +++ b/requirements/dev.pip @@ -13,6 +13,7 @@ mock==2.0.0 PyContracts==1.7.9 pyenchant==1.6.7 pylint==1.6.4 +pytest unittest-mixins==1.1.1 # for kitting. -- cgit v1.2.1