aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2018-05-13 16:23:49 +0200
committerPaul Kehrer <paul.l.kehrer@gmail.com>2018-05-13 10:23:49 -0400
commit40c6d4051214c13e0c0640b55edadb0e5aa0ea0c (patch)
tree375b800973d4585a1f6c201540bcb1cfafdd9fe5
parent7548c63b5e70ed1b2e3e85cb56bb579441545048 (diff)
downloadcryptography-40c6d4051214c13e0c0640b55edadb0e5aa0ea0c.tar.gz
cryptography-40c6d4051214c13e0c0640b55edadb0e5aa0ea0c.tar.bz2
cryptography-40c6d4051214c13e0c0640b55edadb0e5aa0ea0c.zip
Use pytest instead of py.test per upstream recommendation, #dropthedot (#4236)
http://blog.pytest.org/2016/whats-new-in-pytest-30/ https://twitter.com/hashtag/dropthedot
-rw-r--r--docs/development/getting-started.rst2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/development/getting-started.rst b/docs/development/getting-started.rst
index 96b4b6d7..953ae959 100644
--- a/docs/development/getting-started.rst
+++ b/docs/development/getting-started.rst
@@ -61,7 +61,7 @@ automatically, so all you have to do is:
.. code-block:: console
- $ py.test
+ $ pytest
...
62746 passed in 220.43 seconds
diff --git a/tox.ini b/tox.ini
index a1e97c50..86d23aae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -74,7 +74,7 @@ deps =
{[testenv]deps}
pytest-random
commands =
- py.test --capture=no --strict --random {posargs}
+ pytest --capture=no --strict --random {posargs}
[flake8]
exclude = .tox,*.egg,.git,_build,.hypothesis