diff --git a/tox.ini b/tox.ini index 7c32fc460..2e56f6107 100644 --- a/tox.ini +++ b/tox.ini @@ -4,68 +4,56 @@ # and then run "tox" from this directory. [tox] -envlist = - py27-{test} - py38-{test,cov,flake8} - docs +envlist = py27-test, py37-test, py27-flake8, docs # The exhaustive list of environments is: -# py{27,35,36,37,38}-{test,cov,flake8}, docs - -[gh-actions:env] -PLATFORM = - ubuntu-latest: linux - windows-latest: windows - -[testenv] -passenv = - LANG # avoids output errors - NOSE_SHOW_SKIPPED # Undocumented feature of nose-show-skipped. -deps = - {test,cov}: {[_test]deps} - flake8: {[_flake8]deps} - py27: pathlib -commands = - py27-cov: python -m nose --with-coverage {posargs} - py27-flake8: flake8 {posargs} {[_flake8]files} - py27-test: python -m nose {posargs} - py3{4,5,6,7,8}-cov: python -bb -m nose --with-coverage {posargs} - py3{4,5,6,7,8}-flake8: flake8 {posargs} {[_flake8]files} - py3{4,5,6,7,8}-test: python -bb -m nose {posargs} +# envlist = py{27,34,35}-{test,cov}, py{27,34,35}-flake8, docs [_test] deps = beautifulsoup4 - coverage flask - discogs-client mock nose nose-show-skipped pylast - python-mpd2 - pyxdg rarfile + responses>=0.3.0 + pyxdg + python-mpd2 + coverage + discogs-client requests_oauthlib - responses - sphinx [_flake8] deps = flake8 - flake8-blind-except flake8-coding flake8-future-import - pep8-naming -files = - beet - beets - beetsplug - docs - setup.py - test + flake8-blind-except + pep8-naming~=0.7.0 +files = beets beetsplug beet test setup.py docs + +[testenv] +passenv = + NOSE_SHOW_SKIPPED # Undocumented feature of nose-show-skipped. +deps = + {test,cov}: {[_test]deps} + py27: pathlib + py{27,34,35,36,37,38}-flake8: {[_flake8]deps} +commands = + py27-cov: python -m nose --with-coverage {posargs} + py27-test: python -m nose {posargs} + py3{4,5,6,7,8}-cov: python -bb -m nose --with-coverage {posargs} + py3{4,5,6,7,8}-test: python -bb -m nose {posargs} + py27-flake8: flake8 --min-version 2.7 {posargs} {[_flake8]files} + py34-flake8: flake8 --min-version 3.4 {posargs} {[_flake8]files} + py35-flake8: flake8 --min-version 3.5 {posargs} {[_flake8]files} + py36-flake8: flake8 --min-version 3.6 {posargs} {[_flake8]files} + py37-flake8: flake8 --min-version 3.7 {posargs} {[_flake8]files} + py38-flake8: flake8 --min-version 3.8 {posargs} {[_flake8]files} [testenv:docs] basepython = python2.7 deps = sphinx -commands = sphinx-build -W -q -b html docs {envtmpdir}/html {posargs} +commands = sphinx-build -W -q -b html docs {envtmpdir}/html {posargs} \ No newline at end of file