summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2020-05-06 22:40:38 -0500
committerGitHub <noreply@github.com>2020-05-06 22:40:38 -0500
commit33eefaeb4542546fe5febd6e22a35418f59fbdde (patch)
treed6ff27fe811bf7f3d63822f1cba2601ef36c8d20 /docs
parentf43f5f61c2113f0ed0e7d104d823d6b3ac174a51 (diff)
parent57687face8ec3a912d6d886b8b2bcf27a97c82d0 (diff)
downloadpyramid-33eefaeb4542546fe5febd6e22a35418f59fbdde.tar.gz
pyramid-33eefaeb4542546fe5febd6e22a35418f59fbdde.tar.bz2
pyramid-33eefaeb4542546fe5febd6e22a35418f59fbdde.zip
Merge pull request #3578 from Pylons/switch-to-pytest
Switch to pytest
Diffstat (limited to 'docs')
-rw-r--r--docs/typographical-conventions.rst9
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/typographical-conventions.rst b/docs/typographical-conventions.rst
index 7f052cbc8..0a9c194e4 100644
--- a/docs/typographical-conventions.rst
+++ b/docs/typographical-conventions.rst
@@ -98,10 +98,11 @@ ini:
.. code-block:: ini
- [nosetests]
- match=^test
- where=pyramid
- nocapture=1
+ [tool:pytest]
+ python_files = test_*.py
+ testpaths =
+ tests
+ addopts = -W always --cov
Interactive Python: