diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-01-31 13:07:44 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-01-31 13:07:44 -0500 |
| commit | 2a64c9beb31c1800f86dc6a6783d2d4c7e94c40b (patch) | |
| tree | 6f073e1cde74a68d120bceffcef87662221c7395 | |
| parent | 4f9083e4bacdf4557bfae28479c836db680011c5 (diff) | |
| parent | ee0d8647d8537b9de2aeafeba4acd74910f98a4f (diff) | |
| download | pytest-runner-2a64c9beb31c1800f86dc6a6783d2d4c7e94c40b.tar.gz | |
Merge branch 'skeleton'
| -rw-r--r-- | docs/conf.py | 7 | ||||
| -rw-r--r-- | tests/requirements.txt | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/docs/conf.py b/docs/conf.py index 2d86231..e6af71f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -5,6 +5,9 @@ import os import sys import subprocess +if 'check_output' not in dir(subprocess): + import subprocess32 as subprocess + extensions = [ 'sphinx.ext.autodoc', 'rst.linker', @@ -42,6 +45,10 @@ link_files = { pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n", with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n", ), + dict( + pattern=r"PEP[- ](?P<pep_number>\d+)", + url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/', + ), ], ), } diff --git a/tests/requirements.txt b/tests/requirements.txt index 70bc02f..ab48405 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1 +1,2 @@ pytest >= 2.8 +subprocess32; python_version=="2.6" |