summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-02-19 11:12:13 -0500
committerJason R. Coombs <jaraco@jaraco.com>2016-02-19 11:12:13 -0500
commit1b31a684e7198b9f46faaeddcae0cb94a0e43e84 (patch)
tree0493e208883f9b3ed692db667d5768ba2fd03213
parentbe18a01654d05ebfba04e713c20c1fbd4d170dc3 (diff)
downloadpython-setuptools-git-1b31a684e7198b9f46faaeddcae0cb94a0e43e84.tar.gz
Add timestamps to changelog.
-rw-r--r--docs/conf.py4
-rwxr-xr-xsetup.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 155f83f3..1a4da380 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -254,6 +254,10 @@ link_files = {
pattern=r"PEP[- ](?P<pep_number>\d+)",
url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
),
+ dict(
+ pattern=r"^(?m)((?P<scm_version>\d+(\.\d+){1,2}))\n[-=]+\n",
+ with_scm="{text}\n{rev[timestamp]}\n",
+ ),
],
),
}
diff --git a/setup.py b/setup.py
index 2aedfc12..a59d374d 100755
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,7 @@ if (sys.platform == 'win32' or (os.name == 'java' and os._name == 'nt')) \
needs_pytest = set(['ptr', 'pytest', 'test']).intersection(sys.argv)
pytest_runner = ['pytest-runner'] if needs_pytest else []
needs_sphinx = set(['build_sphinx', 'upload_docs']).intersection(sys.argv)
-sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else []
+sphinx = ['sphinx', 'rst.linker>=1.4'] if needs_sphinx else []
setup_params = dict(
name="setuptools",