summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-04-16 04:44:55 -0700
committerSteve Piercy <web@stevepiercy.com>2016-04-16 04:44:55 -0700
commit86e187a734728611bc8bfd5792133502ffd59160 (patch)
tree45fc93d7f96b20a2c5d48e996e173649deffc735 /docs/conf.py
parent823ef1d9c931106de11e7d383856fcc2fc99c3fa (diff)
downloadpyramid-86e187a734728611bc8bfd5792133502ffd59160.tar.gz
pyramid-86e187a734728611bc8bfd5792133502ffd59160.tar.bz2
pyramid-86e187a734728611bc8bfd5792133502ffd59160.zip
quick_tutorial cleanup
- replace nose with pytest - cleanup unit_testing.rst
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 1600e1f5c..c40f1c875 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -67,6 +67,7 @@ intersphinx_mapping = {
'jinja2': ('http://docs.pylonsproject.org/projects/pyramid-jinja2/en/latest/', None),
'pylonswebframework': ('http://docs.pylonsproject.org/projects/pylons-webframework/en/latest/', None),
'python': ('https://docs.python.org/3', None),
+ 'pytest': ('http://pytest.org/latest/', None),
'sqla': ('http://docs.sqlalchemy.org/en/latest', None),
'tm': ('http://docs.pylonsproject.org/projects/pyramid-tm/en/latest/', None),
'toolbar': ('http://docs.pylonsproject.org/projects/pyramid-debugtoolbar/en/latest', None),