diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5045a1b9c..56596f83b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,9 +40,8 @@ jobs: strategy: matrix: platform: [ ubuntu-latest ] - python-version: [ 5, 6, 7, 8 ] + python-version: [ 4, 5, 6, 7, 8 ] env: - NOSE_SHOW_SKIPPED: 1 PY_COLOR: 1 steps: - uses: actions/checkout@v2 @@ -73,7 +72,7 @@ jobs: run: | tox -e py3${{ matrix.python-version }}-test 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 codecov || true - name: Test with tox diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml index 11085223f..9a4469e14 100644 --- a/.github/workflows/integration_test.yaml +++ b/.github/workflows/integration_test.yaml @@ -10,7 +10,6 @@ jobs: env: NOSE_SHOW_SKIPPED: 1 PY_COLOR: 1 - INTEGRATION_TEST: 1 steps: - uses: actions/checkout@v2 - name: Set up Python 3.8 @@ -29,4 +28,4 @@ jobs: pip install tox - name: Test with tox run: | - tox -e py38-test \ No newline at end of file + tox -e int \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 0660b2721..89649ed11 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,3 @@ -[nosetests] -verbosity=1 -logging-clear-handlers=1 - [flake8] min-version=2.7 accept-encodings=utf-8 diff --git a/tox.ini b/tox.ini index a62981ec8..13531e556 100644 --- a/tox.ini +++ b/tox.ini @@ -4,57 +4,33 @@ # and then run "tox" from this directory. [tox] -envlist = py27-test, py37-test, py27-flake8, docs - -# The exhaustive list of environments is: -# envlist = py{27,34,35}-{test,cov}, py{27,34,35}-flake8, docs +envlist = py27-test, py38-{cov,lint}, docs [_test] -deps = - beautifulsoup4 - flask - mock - nose - nose-show-skipped - pylast - rarfile - responses>=0.3.0 - pyxdg - python-mpd2 - coverage - discogs-client - requests_oauthlib +deps = .[test] # defined in setup.py -[_flake8] -deps = - flake8 - flake8-coding - flake8-future-import - flake8-blind-except - pep8-naming +[_lint] +deps = .[lint] # defined in setup.py files = beets beetsplug beet test setup.py docs [testenv] -passenv = - NOSE_SHOW_SKIPPED # Undocumented feature of nose-show-skipped. - INTEGRATION_TEST # set to 1 for integration tests deps = {test,cov}: {[_test]deps} + lint: {[_lint]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 {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} + py27-test: python -m pytest {posargs} + py3{4,5,6,7,8}-test: python -bb -m pytest {posargs} + cov: coverage run -m pytest {posargs} + lint: python -m flake8 {posargs} {[_lint]files} [testenv:docs] basepython = python2.7 deps = sphinx 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} \ No newline at end of file