Merge pull request #44 from wisp3rwind/pr-update-travis-cfg

Update travis configuration

.travis.yml

@@ -19,26 +19,18 @@ matrix:
     - env: TOX_ENV=py36-beets_release
       python: 3.6
 
-      # xenial is required to run Python >= 3.7, cf.
-      # https://github.com/travis-ci/travis-ci/issues/9815#issuecomment-402045581
-    - env: TOX_ENV=py37-beets_master COVERAGE=1
-      python: 3.7
-      dist: xenial
-    - env: TOX_ENV=py37-beets_release
-      python: 3.7
-      dist: xenial
-
-    - env: TOX_ENV=py38-beets_master
-      python: 3.8-dev
-      dist: xenial
-      sudo: yes
+    - env: TOX_ENV=py38-beets_master COVERAGE=1
+      python: 3.8
     - env: TOX_ENV=py38-beets_release
-      python: 3.8-dev
-      dist: xenial
-      sudo: yes
+      python: 3.8
 
-    - env: TOX_ENV=py36-flake8
-      python: 3.6
+    - env: TOX_ENV=py39-beets_master
+      python: 3.9-dev
+    - env: TOX_ENV=py39-beets_release
+      python: 3.9-dev
+
+    - env: TOX_ENV=py38-flake8
+      python: 3.8
 
 install:
   - "pip install tox"

setup.cfg

@@ -1,8 +1,8 @@
-[nosetests]
-verbosity=1
-with-coverage=1
-cover-erase=1
-cover-package=beetsplug.alternatives
-cover-html=1
-cover-html-dir=coverage
-logging-clear-handlers=1
+[coverage:run]
+source = beetsplug.alternatives
+
+[coverage:html]
+directory = coverage
+
+[tool:pytest]
+addopts = --cov --cov-report=term --cov-report=html

setup.py

@@ -34,5 +34,6 @@
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
 )

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{27,36}-beets_{master}, py36-flake8
+envlist = py{27,38}-beets_{master}, py38-flake8
 
 [testenv]
 basepython =
@@ -9,13 +9,15 @@ basepython =
     py36: python3.6
     py37: python3.7
     py38: python3.8
+    py39: python3.9
 flake8_files = beetsplug test setup.py
 commands =
-    beets_{master,release}: nosetests {posargs}
+    beets_{master,release}: pytest {posargs}
     flake8: flake8 {posargs} {[testenv]flake8_files}
 deps =
     coverage
-    nose
+    pytest
+    pytest-cov
     mock
     beets_master: git+git://github.com/sampsyo/beets.git@master
     flake8: flake8