nose -> pytest and clean-up tox

This commit is contained in:
Jacob Pavlock 2020-07-06 17:03:11 -07:00
parent 723e04ebb3
commit dabde74683
4 changed files with 18 additions and 48 deletions

View file

@ -40,9 +40,8 @@ jobs:
strategy: strategy:
matrix: matrix:
platform: [ ubuntu-latest ] platform: [ ubuntu-latest ]
python-version: [ 5, 6, 7, 8 ] python-version: [ 4, 5, 6, 7, 8 ]
env: env:
NOSE_SHOW_SKIPPED: 1
PY_COLOR: 1 PY_COLOR: 1
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -73,7 +72,7 @@ jobs:
run: | run: |
tox -e py3${{ matrix.python-version }}-test tox -e py3${{ matrix.python-version }}-test
tox -e py3${{ matrix.python-version }}-cov tox -e py3${{ matrix.python-version }}-cov
tox -e py3${{ matrix.python-version }}-flake8 tox -e py3${{ matrix.python-version }}-lint
pip install codecov || true pip install codecov || true
codecov || true codecov || true
- name: Test with tox - name: Test with tox

View file

@ -10,7 +10,6 @@ jobs:
env: env:
NOSE_SHOW_SKIPPED: 1 NOSE_SHOW_SKIPPED: 1
PY_COLOR: 1 PY_COLOR: 1
INTEGRATION_TEST: 1
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set up Python 3.8 - name: Set up Python 3.8
@ -29,4 +28,4 @@ jobs:
pip install tox pip install tox
- name: Test with tox - name: Test with tox
run: | run: |
tox -e py38-test tox -e int

View file

@ -1,7 +1,3 @@
[nosetests]
verbosity=1
logging-clear-handlers=1
[flake8] [flake8]
min-version=2.7 min-version=2.7
accept-encodings=utf-8 accept-encodings=utf-8

54
tox.ini
View file

@ -4,57 +4,33 @@
# and then run "tox" from this directory. # and then run "tox" from this directory.
[tox] [tox]
envlist = py27-test, py37-test, py27-flake8, docs envlist = py27-test, py38-{cov,lint}, docs
# The exhaustive list of environments is:
# envlist = py{27,34,35}-{test,cov}, py{27,34,35}-flake8, docs
[_test] [_test]
deps = deps = .[test] # defined in setup.py
beautifulsoup4
flask
mock
nose
nose-show-skipped
pylast
rarfile
responses>=0.3.0
pyxdg
python-mpd2
coverage
discogs-client
requests_oauthlib
[_flake8] [_lint]
deps = deps = .[lint] # defined in setup.py
flake8
flake8-coding
flake8-future-import
flake8-blind-except
pep8-naming
files = beets beetsplug beet test setup.py docs files = beets beetsplug beet test setup.py docs
[testenv] [testenv]
passenv =
NOSE_SHOW_SKIPPED # Undocumented feature of nose-show-skipped.
INTEGRATION_TEST # set to 1 for integration tests
deps = deps =
{test,cov}: {[_test]deps} {test,cov}: {[_test]deps}
lint: {[_lint]deps}
py27: pathlib py27: pathlib
py{27,34,35,36,37,38}-flake8: {[_flake8]deps}
commands = commands =
py27-cov: python -m nose --with-coverage {posargs} py27-test: python -m pytest {posargs}
py27-test: python -m nose {posargs} py3{4,5,6,7,8}-test: python -bb -m pytest {posargs}
py3{4,5,6,7,8}-cov: python -bb -m nose --with-coverage {posargs} cov: coverage run -m pytest {posargs}
py3{4,5,6,7,8}-test: python -bb -m nose {posargs} lint: python -m flake8 {posargs} {[_lint]files}
py27-flake8: flake8 {posargs} {[_flake8]files}
py34-flake8: flake8 {posargs} {[_flake8]files}
py35-flake8: flake8 {posargs} {[_flake8]files}
py36-flake8: flake8 {posargs} {[_flake8]files}
py37-flake8: flake8 {posargs} {[_flake8]files}
py38-flake8: flake8 {posargs} {[_flake8]files}
[testenv:docs] [testenv:docs]
basepython = python2.7 basepython = python2.7
deps = sphinx deps = sphinx
commands = sphinx-build -W -q -b html docs {envtmpdir}/html {posargs} commands = sphinx-build -W -q -b html docs {envtmpdir}/html {posargs}
[testenv:int]
basepython = python3.8
deps = {[_test]deps}
setenv = INTEGRATION_TEST = 1
commands = python -m pytest {posargs}