Skip to content

Commit 47bbc7c

Browse files
jaracojaraco
committed
Merge with master
2 parents 0d08a53 + 01e953b commit 47bbc7c

4 files changed

Lines changed: 35 additions & 6 deletions

File tree

‎.travis.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
sudo: false
22
language: python
33
python:
4-
- 2.7
5-
- 3.5
4+
- 2.7
5+
- 3.5
66
script:
7-
- pip install -U pytest
8-
- python setup.py test
7+
- pip install -U pytest
8+
- python setup.py test
9+
deploy:
10+
provider: pypi
11+
on:
12+
tags: true
13+
all_branches: true
14+
user: jaraco
15+
# supply password with `travis encrypt --add deploy.password`
16+
distributions: release
17+
python: 3.5

‎docs/conf.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
extensions = [
77
'sphinx.ext.autodoc',
8+
'rst.linker',
89
]
910

1011
# General information about the project.
@@ -17,3 +18,22 @@
1718
release = version
1819

1920
master_doc = 'index'
21+
22+
link_files = {
23+
'CHANGES.rst': dict(
24+
using=dict(
25+
GH='https://github.com',
26+
project=project,
27+
),
28+
replace=[
29+
dict(
30+
pattern=r"(Issue )?#(?P<issue>\d+)",
31+
url='{GH}/jaraco/{project}/issues/{issue}',
32+
),
33+
dict(
34+
pattern=r"^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n",
35+
with_scm="{text}\n{rev[timestamp]:%d %b %Y}\n",
36+
),
37+
],
38+
),
39+
}

‎docs/history.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
History
66
*******
77

8-
.. include:: ../CHANGES.rst
8+
.. include:: ../CHANGES (links).rst

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
needs_pytest = {'pytest', 'test'}.intersection(sys.argv)
1414
pytest_runner = ['pytest_runner'] if needs_pytest else []
1515
needs_sphinx = {'release', 'build_sphinx', 'upload_docs'}.intersection(sys.argv)
16-
sphinx = ['sphinx'] if needs_sphinx else []
16+
sphinx = ['sphinx', 'rst.linker'] if needs_sphinx else []
1717
needs_wheel = {'release', 'bdist_wheel'}.intersection(sys.argv)
1818
wheel = ['wheel'] if needs_wheel else []
1919

0 commit comments

Comments
 (0)