From 32c8c981f262248b20730d18e2d4fcad074488dd Mon Sep 17 00:00:00 2001
From: David Sanders <davesque@gmail.com>
Date: Mon, 4 Jun 2018 16:36:02 -0600
Subject: [PATCH 1/4] Remove references to deprecated "py.test"

---
 Makefile   | 2 +-
 pytest.ini | 2 +-
 tox.ini    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 5b0f799..7b93655 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ lint-roll:
 	$(MAKE) lint
 
 test:
-	py.test tests
+	pytest tests
 
 test-all:
 	tox
diff --git a/pytest.ini b/pytest.ini
index d53de3a..f5fdc0e 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -4,4 +4,4 @@ python_paths= .
 xfail_strict=true
 
 [pytest-watch]
-runner= py.test --failed-first --maxfail=1 --no-success-flaky-report
+runner= pytest --failed-first --maxfail=1 --no-success-flaky-report
diff --git a/tox.ini b/tox.ini
index 34a66b4..066b377 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ ignore=
 [testenv]
 usedevelop=True
 commands=
-    core: py.test {posargs:tests/core}
+    core: pytest {posargs:tests/core}
     doctest: make -C {toxinidir}/docs doctest
 basepython =
     doctest: python

From 00819dd924174c78829f97679871fd181dd12509 Mon Sep 17 00:00:00 2001
From: David Sanders <davesque@gmail.com>
Date: Mon, 4 Jun 2018 16:36:35 -0600
Subject: [PATCH 2/4] Whitespace

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 066b377..74ea1d4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,5 +38,5 @@ whitelist_externals=make
 basepython=python
 extras=lint
 commands=
-  flake8 {toxinidir}/<MODULE_NAME> {toxinidir}/tests
-  isort --recursive --check-only --diff {toxinidir}/<MODULE_NAME> {toxinidir}/tests
+    flake8 {toxinidir}/<MODULE_NAME> {toxinidir}/tests
+    isort --recursive --check-only --diff {toxinidir}/<MODULE_NAME> {toxinidir}/tests

From e7d0a8577b8f6f5cac11e6f86199f7bca24b3ecd Mon Sep 17 00:00:00 2001
From: David Sanders <davesque@gmail.com>
Date: Mon, 4 Jun 2018 16:37:38 -0600
Subject: [PATCH 3/4] Fix testing dependencies

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

diff --git a/setup.py b/setup.py
index 4308294..92ee090 100644
--- a/setup.py
+++ b/setup.py
@@ -8,6 +8,7 @@ from setuptools import (
 extras_require={
     'test': [
         "pytest==3.3.2",
+        "pytest-xdist",
         "tox>=2.9.1,<3",
     ],
     'lint': [
@@ -20,7 +21,6 @@ extras_require={
     ],
     'dev': [
         "bumpversion>=0.5.3,<1",
-        "pytest-xdist",
         "pytest-watch>=4.1.0,<5",
         "wheel",
         "ipython",

From 0a83658b3ee41fdc8473e3156a5b7591ef992c9b Mon Sep 17 00:00:00 2001
From: David Sanders <davesque@gmail.com>
Date: Mon, 4 Jun 2018 16:37:52 -0600
Subject: [PATCH 4/4] Lint in setup.py

---
 setup.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index 92ee090..55b3c90 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ from setuptools import (
     find_packages,
 )
 
-extras_require={
+extras_require = {
     'test': [
         "pytest==3.3.2",
         "pytest-xdist",
@@ -28,10 +28,10 @@ extras_require={
 }
 
 extras_require['dev'] = (
-    extras_require['dev']
-    + extras_require['test']
-    + extras_require['lint']
-    + extras_require['doc']
+    extras_require['dev'] +
+    extras_require['test'] +
+    extras_require['lint'] +
+    extras_require['doc']
 )
 
 setup(