From 05bb4ffa1ba8ff72eb8a8d499045003263a2d3a7 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 3 Mar 2023 15:58:53 +0000 Subject: [PATCH] tests: tidy tox --- LICENCE | 2 +- tox.ini | 33 +++++++++------------------------ 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/LICENCE b/LICENCE index 5b3cab7fb..6a370c56d 100644 --- a/LICENCE +++ b/LICENCE @@ -7,7 +7,7 @@ Exceptions or notable authors are listed below in reverse chronological order: * files: * - MPLv2.0 2015-2021 (c) Casper da Costa-Luis + MPLv2.0 2015-2023 (c) Casper da Costa-Luis [casperdcl](https://github.com/casperdcl). * files: tqdm/_tqdm.py MIT 2016 (c) [PR #96] on behalf of Google Inc. diff --git a/tox.ini b/tox.ini index c64f5de75..64b49b7cf 100644 --- a/tox.ini +++ b/tox.ini @@ -4,21 +4,16 @@ # and then run "tox" from this directory. [tox] -# deprecation warning: py{27,py2,34,35,36} -envlist=py{27,34,35,36,37,38,39,310,311,py2,py3}{,-tf}{,-keras}, perf, setup.py +envlist=py{37,38,39,310,311,py3}{,-tf}{,-keras}, perf, setup.py isolated_build=True [gh-actions] python= - 2.7: py27 - 3.5: py35 - 3.6: py36 3.7: py37 3.8: py38 3.9: py39 3.10: py310 3.11: py311 - pypy-2.7: pypy2 pypy-3.7: pypy3 [gh-actions:env] PLATFORM= @@ -27,12 +22,11 @@ PLATFORM= [core] deps= pytest - py3{4,5,6}: pytest<7 pytest-cov pytest-timeout - py3{7,8,9,10,11}: pytest-asyncio - py3{6,7,8,9,10,11}: ipywidgets - py3{7,8,9,10,11}: git+https://github.com/casperdcl/nbval.git@master#egg=nbval + pytest-asyncio + ipywidgets + git+https://github.com/casperdcl/nbval.git@master#egg=nbval coverage coveralls codecov @@ -50,26 +44,17 @@ deps= matplotlib numpy pandas + rich tf: tensorflow!=2.5.0 - !py27-keras: keras - py27-keras: keras<2.5 - py35-keras: keras<2.7 - py27-tf: protobuf<3.18 - py3{6,7,8,9,10,11}: rich + keras: keras commands= - py3{4,5,6}: pytest --cov=tqdm --cov-report=xml --cov-report=term -k "not perf" -o addopts= -v --tb=short -rxs -W=error --durations=0 --durations-min=0.1 - py3{7,8,9,10,11}: pytest --cov=tqdm --cov-report= tests_notebook.ipynb --nbval --nbval-current-env -W=ignore --nbval-sanitize-with=setup.cfg - py3{7,8,9,10,11}: pytest --cov=tqdm --cov-report=xml --cov-report=term --cov-append -k "not perf" + pytest --cov=tqdm --cov-report= tests_notebook.ipynb --nbval --nbval-current-env -W=ignore --nbval-sanitize-with=setup.cfg + pytest --cov=tqdm --cov-report=xml --cov-report=term --cov-append -k "not perf" {[core]commands} allowlist_externals=codacy -[testenv:py{27,py2}{,-tf}{,-keras}] -commands= - pytest --cov=tqdm --cov-report=xml --cov-report=term -k "not perf" -o addopts= -v --tb=short -rxs -W=error --durations=10 - {[core]commands} - # no cython/numpy/pandas -[testenv:py{34,py2,py3}] +[testenv:pypy3] deps={[core]deps} [testenv:perf]