From 068d8f29b5757d85d5d9ff291bd294cd43e472c3 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 19 Nov 2023 15:21:17 -0600 Subject: [PATCH] Fix errors for tox runs --- tests/commands/test_base.py | 2 -- tox.ini | 25 ++++++++++--------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/tests/commands/test_base.py b/tests/commands/test_base.py index e400fe4..2f7baff 100644 --- a/tests/commands/test_base.py +++ b/tests/commands/test_base.py @@ -118,8 +118,6 @@ class TestCommandArgumentParser(TestCase): kw = { 'prog': 'wutta', 'add_help': False, - # nb. this flag requires python 3.9 - 'exit_on_error': False, } # nb. examples below assume a command line like: diff --git a/tox.ini b/tox.ini index b701f97..a086a02 100644 --- a/tox.ini +++ b/tox.ini @@ -8,25 +8,20 @@ envlist = py36, py37, py38, py39, py310, py311 requires = virtualenv<20.22.0 [testenv] -commands = - pip install -U pip - pip install -U setuptools wheel - pip install -U --upgrade-strategy eager wuttjamaican[db,docs,tests] - pytest {posargs} +extras = db,docs,tests +commands = pytest {posargs} + +[testenv:py37] +# nb. newer coverage is causing segfault for this one, so must avoid that +deps = coverage<7.2.4 [testenv:coverage] basepython = python3.11 -commands = - pip install -U pip - pip install -U setuptools wheel - pip install -U --upgrade-strategy eager wuttjamaican[db,tests] - pytest --cov=wuttjamaican --cov-report=html --cov-fail-under=100 +extras = db,tests +commands = pytest --cov=wuttjamaican --cov-report=html --cov-fail-under=100 [testenv:docs] basepython = python3.11 +extras = db,docs changedir = docs -commands = - pip install -U pip - pip install -U setuptools wheel - pip install -U --upgrade-strategy eager wuttjamaican[db,docs] - sphinx-build -b html -d {envtmpdir}/doctrees -W -T . {envtmpdir}/docs +commands = sphinx-build -b html -d {envtmpdir}/doctrees -W -T . {envtmpdir}/docs