Use pytest instead of py.test per upstream recommendation, #dropthedot

http://blog.pytest.org/2016/whats-new-in-pytest-30/
https://twitter.com/hashtag/dropthedot

3 files changed, 4 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 04fc63f..7a3cd5d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -363,7 +363,7 @@ Bug Fixes
 Other
 
 * Documentation updates.
-* Test suite now uses tox and py.test.
+* Test suite now uses tox and pytest.
 * py3k fixes (by vthriller).
 * py3k fixes in setup.py (by Florian Bauer).
 * setup.py now requires distribute (by Florian Bauer).
@@ -379,7 +379,7 @@ Bug Fixes
 * Improve grouping and formatting of concatenated strings (issue53).
 * Improve handling of varchar() (by Mike Amy).
 * Clean up handling of various SQL elements.
-* Switch to py.test and clean up tests.
+* Switch to pytest and clean up tests.
 * Several minor fixes.
 
 Other
diff --git a/Makefile b/Makefile
index b45ac10..0844e5b 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ test:
 	tox
 
 coverage:
-	py.test --cov=sqlparse --cov-report=html --cov-report=term
+	pytest --cov=sqlparse --cov-report=html --cov-report=term
 
 clean:
 	$(PYTHON) setup.py clean
diff --git a/tox.ini b/tox.ini
index e4dad60..c5c9d1e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ passenv =
     TRAVIS
 commands =
     sqlformat --version
-    py.test --cov=sqlparse {posargs}
+    pytest --cov=sqlparse {posargs}
 
 [testenv:flake8]
 deps =