From a3eeadd8e977df5633769cf7b92bed56962c3349 Mon Sep 17 00:00:00 2001
From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
Date: Wed, 15 Jan 2020 23:25:51 +0100
Subject: [PATCH 1/4] travis.yml: bump to python 3.8, 3.9-dev

---
 .travis.yml | 20 ++++++++++----------
 tox.ini     |  3 ++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2a19a8c..429446a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,24 +21,24 @@ matrix:
 
       # 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
+    - env: TOX_ENV=py38-beets_master COVERAGE=1
+      python: 3.8
       dist: xenial
-    - env: TOX_ENV=py37-beets_release
-      python: 3.7
+    - env: TOX_ENV=py38-beets_release
+      python: 3.8
       dist: xenial
 
-    - env: TOX_ENV=py38-beets_master
-      python: 3.8-dev
+    - env: TOX_ENV=py39-beets_master
+      python: 3.9-dev
       dist: xenial
       sudo: yes
-    - env: TOX_ENV=py38-beets_release
-      python: 3.8-dev
+    - env: TOX_ENV=py39-beets_release
+      python: 3.9-dev
       dist: xenial
       sudo: yes
 
-    - env: TOX_ENV=py36-flake8
-      python: 3.6
+    - env: TOX_ENV=py38-flake8
+      python: 3.8
 
 install:
   - "pip install tox"
diff --git a/tox.ini b/tox.ini
index 9d21e23..091cd35 100644
--- a/tox.ini
+++ b/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,6 +9,7 @@ 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}

From 73f10a20a152c5650a814d8ff0a347182ae8fcaa Mon Sep 17 00:00:00 2001
From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
Date: Wed, 15 Jan 2020 23:26:09 +0100
Subject: [PATCH 2/4] travis.yml: remove deprecated sudo keyword; do not
 specify dist explicitly

travis now defaults to Xenial, which has all Python versions we need
---
 .travis.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 429446a..2caefe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,23 +19,15 @@ 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=py38-beets_master COVERAGE=1
       python: 3.8
-      dist: xenial
     - env: TOX_ENV=py38-beets_release
       python: 3.8
-      dist: xenial
 
     - env: TOX_ENV=py39-beets_master
       python: 3.9-dev
-      dist: xenial
-      sudo: yes
     - env: TOX_ENV=py39-beets_release
       python: 3.9-dev
-      dist: xenial
-      sudo: yes
 
     - env: TOX_ENV=py38-flake8
       python: 3.8

From 9ffe2d7f1f9180cd27913983c4e1b51ace11fb82 Mon Sep 17 00:00:00 2001
From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
Date: Wed, 15 Jan 2020 23:58:52 +0100
Subject: [PATCH 3/4] setup.py: update classifiers to include Python 3.8

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 4ac947d..daa833b 100755
--- a/setup.py
+++ b/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',
     ],
 )

From e2f0422ae9d546a53ffd8f2792b35332b6cfc011 Mon Sep 17 00:00:00 2001
From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
Date: Thu, 16 Jan 2020 01:15:41 +0100
Subject: [PATCH 4/4] replace nosetests (unmaintained) with pytest

---
 setup.cfg | 16 ++++++++--------
 tox.ini   |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 12f3031..6744737 100644
--- a/setup.cfg
+++ b/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
diff --git a/tox.ini b/tox.ini
index 091cd35..2b1c774 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,11 +12,12 @@ basepython =
     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