From: Marc Foley Date: Wed, 22 Feb 2023 15:58:34 +0000 (+0000) Subject: wip update tox X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c58a7adeb51c8a1bfb4a56e398b6e20062da4b27;p=thirdparty%2Fgoogle%2Ffonts.git wip update tox --- diff --git a/tox.ini b/tox.ini index fb30fc4340..283a3834b5 100644 --- a/tox.ini +++ b/tox.ini @@ -1,66 +1,38 @@ [tox] -envlist = py37, py38, py39, coverage, flake8, pylint - -[gh-actions] -python = - 3.7: py37, coverage, flake8, pylint - 3.8: py38, coverage, flake8, pylint - 3.9: py39, coverage, flake8, pylint +envlist = lint, py3{7,8,9}, coverage-report +skip_missing_interpreters = true [testenv] deps = - pytest - coverage - -rrequirements.txt - -rdev-requirements.txt -commands = coverage run -m pytest {posargs} -passenv = LD_LIBRARY_PATH LD_PRELOAD - -[testenv:coverage] -deps = coverage -skip_install = true + -r requirements.txt + -r dev-requirements.txt +; download the latest pip, setuptools and wheel when creating the venv +download = true commands = - coverage report - coverage html + coverage run --parallel-mode -m pytest {posargs} -# Exclude a lot of tests here without turning them off in setup.cfg, because a -# developer might want to see and fix them. This is more of a regression test. -[testenv:flake8] +[testenv:lint] +skip_install = true deps = + -r dev-requirements.txt +commands = + black --check --diff Lib/gflanguages --exclude .*pb2.py Lib/gflanguages/_version.py + isort --check-only --diff . flake8 - sphinx - sphinx_rtd_theme - recommonmark -commands = flake8 --count --show-source --statistics -# Same rationale as with flake8. -[testenv:pylint] -deps = - pylint - sphinx - sphinx_rtd_theme - recommonmark -wont_fix = invalid-name,protected-access,too-many-lines -maybe_someday = fixme,missing-docstring,line-too-long -commands = pylint --disable={[testenv:pylint]wont_fix},{[testenv:pylint]maybe_someday} Lib/gflanguages +[testenv:coverage-report] +skip_install = true +commands = + coverage combine + coverage xml + coverage report + coverage html [flake8] -select = E,F,W - -exclude = -# Exclude the entire build directory: - build -# Exclude these auto-generated files that should not be hand-edited: - Lib/gflanguages/languages_public_pb2.py, -# No need to traverse hidden directories such as .git, .tox - .*, -# Exclude virtual environment directory: - venv*, -# There's no value in checking cache directories - __pycache__, -# The Sphinx configuration file is mostly autogenerated, ignore it - docs/source/conf.py, +select = C, E, F, W, B, B9 +ignore = E203, E266, E501, W503, B905 +max-line-length = 100 +exclude = .git, __pycache__, build, dist, .eggs, .tox, venv, venv*, .venv, .venv* -max-line-length=100 -ignore = - E126, # continuation line over-indented for hanging indent +[isort] +profile = black \ No newline at end of file