Skip to content

Commit 5062385

Browse files
committed
📝💅 Integrate sphinx-issues into docs env
1 parent 7400ed6 commit 5062385

File tree

3 files changed

+50
-61
lines changed

3 files changed

+50
-61
lines changed

CHANGES.rst

Lines changed: 48 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ Contributor-facing changes
197197

198198
- The test infrastructure has been updated to start using
199199
the upstream reusable workflow :file:`reusable-tox.yml`
200-
from :gh:`tox-dev/workflow` -- by :user:`webknjaz`.
200+
from https://github.com/tox-dev/workflow
201+
-- by :user:`webknjaz`.
201202

202203
This chance allows us to de-duplicate the commonly used
203204
CI shape.
@@ -387,9 +388,9 @@ v9.0.0
387388

388389
- :issue:`252` via :pr:`339`: Cheroot now requires Python
389390
3.6 or later. Python 3.5 and Python 2.7 are still supported
390-
by the :gh:`maint/8.x branch
391-
<cherrypy/cheroot/tree/maint/8.x>` and stabilizing
392-
bugfixes will be accepted to that branch.
391+
by the `maint/8.x branch
392+
<https://github.com/cherrypy/cheroot/tree/maint/8.x>`__ and
393+
stabilizing bugfixes will be accepted to that branch.
393394

394395
v8.6.0
395396
======
@@ -442,7 +443,7 @@ v8.5.1
442443

443444
*(2020-12-12)*
444445

445-
- :cp-issue:`1873` via :pr:`340`: Resurrected an
446+
- :issue:`cherrypy/cherrypy#1873` via :pr:`340`: Resurrected an
446447
unintentionally removed feature of interrupting a server
447448
main thread by externally assigning an exception to the
448449
:py:meth:`HTTPServer.interrupt <cheroot.server.\
@@ -595,8 +596,8 @@ v8.3.0
595596

596597
*(2020-02-09)*
597598

598-
- :cp-issue:`910` via :pr:`243`: Provide TLS-related
599-
details via WSGI environment interface.
599+
- :issue:`cherrypy/cherrypy#910` via :pr:`243`: Provide
600+
TLS-related details via WSGI environment interface.
600601
- :pr:`248`: Fix parsing of the ``--bind`` CLI option
601602
for abstract UNIX sockets.
602603

@@ -606,8 +607,8 @@ v8.2.1
606607

607608
*(2019-10-17)*
608609

609-
- :cp-issue:`1818`: Restore support for ``None``
610-
default argument to ``WebCase.getPage()``.
610+
- :issue:`cherrypy/cherrypy#1818`: Restore support for
611+
:py:data:`None` default argument to ``WebCase.getPage()``.
611612

612613

613614
v8.2.0
@@ -617,8 +618,8 @@ v8.2.0
617618

618619
- Deprecated use of negative timeouts as alias for
619620
infinite timeouts in ``ThreadPool.stop``.
620-
- :cp-issue:`1662` via :pr:`74`: For OPTION requests,
621-
bypass URI as path if it does not appear absolute.
621+
- :issue:`cherrypy/cherrypy#1662` via :pr:`74`: For OPTION
622+
requests, bypass URI as path if it does not appear absolute.
622623

623624

624625
v8.1.0
@@ -664,8 +665,8 @@ v6.6.0
664665
- Revisit :pr:`85` under :pr:`221`. Now
665666
``backports.functools_lru_cache`` is only
666667
required on Python 3.2 and earlier.
667-
- :cp-issue:`1206` via :pr:`204`: Fix race condition in
668-
threadpool shrink code.
668+
- :issue:`cherrypy/cherrypy#1206` via :pr:`204`: Fix race
669+
condition in threadpool shrink code.
669670

670671

671672
v6.5.8
@@ -709,8 +710,8 @@ v6.5.5
709710
- :issue:`99` via :pr:`186`: Sockets now collect statistics (bytes
710711
read and written) on Python 3 same as Python 2.
711712

712-
- :cp-issue:`1618` via :pr:`180`: Ignore OpenSSL's 1.1+ Error 0
713-
under any Python while wrapping a socket.
713+
- :issue:`cherrypy/cherrypy#1618` via :pr:`180`: Ignore OpenSSL's
714+
1.1+ ``Error 0`` under any Python while wrapping a socket.
714715

715716

716717
v6.5.4
@@ -789,8 +790,8 @@ v6.5.0
789790

790791
*(2018-08-29)*
791792

792-
- :cp-issue:`1001` via :pr:`52` and :pr:`108`: Add support for
793-
validating client certificates.
793+
- :issue:`cherrypy/cherrypy#1001` via :pr:`52` and :pr:`108`:
794+
Add support for validating client certificates.
794795

795796

796797
v6.4.0
@@ -827,8 +828,8 @@ v6.3.1
827828

828829
*(2018-05-21)*
829830

830-
- :cp-issue:`1618`: Ignore OpenSSL's 1.1+ Error 0 under Python 2 while
831-
wrapping a socket.
831+
- :issue:`cherrypy/cherrypy#1618`: Ignore OpenSSL's 1.1+
832+
``Error 0`` under Python 2 while wrapping a socket.
832833

833834

834835
v6.3.0
@@ -868,8 +869,8 @@ v6.2.2
868869

869870
*(2018-04-14)*
870871

871-
- :issue:`84` (:cp-issue:`1704`): Fix regression, causing
872-
:py:exc:`ModuleNotFoundError` under ``cygwin``.
872+
- :issue:`84` (:issue:`cherrypy/cherrypy#1704`): Fix regression,
873+
causing :py:exc:`ModuleNotFoundError` under ``cygwin``.
873874

874875

875876
v6.2.1
@@ -940,19 +941,20 @@ v6.1.0
940941

941942
* Stabilize testing
942943

943-
- :cp-issue:`1664` via :pr:`66`: Implement input termination flag support as
944-
suggested by `@mitsuhiko <https://github.com/mitsuhiko>`_ in his
945-
`wsgi.input_terminated Proposal
946-
<https://gist.github.com/mitsuhiko/5721547>`_.
944+
- :issue:`cherrypy/cherrypy#1664` via :pr:`66`: Implement input
945+
termination flag support as suggested by `@mitsuhiko
946+
<https://github.com/mitsuhiko>`__ in his `wsgi.input_terminated
947+
Proposal <https://gist.github.com/mitsuhiko/5721547>`_.
947948

948949
- :issue:`73`: Fix SSL error bypassing.
949950

950951
- :issue:`77` via :pr:`78`: Fix WSGI documentation example to support Python 3.
951952

952953
- :pr:`76`: Send correct conditional HTTP error in helper function.
953954

954-
- :cp-issue:`1404` via :pr:`75`: Fix headers being unsent before request
955-
closed. Now we double check that they've been sent.
955+
- :issue:`cherrypy/cherrypy#1404` via :pr:`75`: Fix headers being
956+
unsent before request closed. Now we double check that they've
957+
been sent.
956958

957959
- Minor docs improvements.
958960

@@ -975,9 +977,9 @@ v5.11.0
975977

976978
*(2017-12-04)*
977979

978-
- :cp-issue:`1621`: To support :py:mod:`~cheroot.test.webtest`
979-
applications that feed absolute URIs to
980-
:py:meth:`~cheroot.test.webtest.WebCase.getPage`
980+
- :issue:`cherrypy/cherrypy#1621`: To support
981+
:py:mod:`~cheroot.test.webtest` applications that feed absolute
982+
URIs to :py:meth:`~cheroot.test.webtest.WebCase.getPage`
981983
but expect the scheme/host/port to be ignored (as cheroot 5.8
982984
and earlier did), provide a ``strip_netloc`` helper and recipe
983985
for calling it in a subclass.
@@ -1018,8 +1020,8 @@ v5.9.0
10181020

10191021
*(2017-11-16)*
10201022

1021-
- :cp-issue:`1088` and :pr:`53`: Avoid using SO_REUSEADDR on Windows
1022-
where it has different semantics.
1023+
- :issue:`cherrypy/cherrypy#1088` and :pr:`53`: Avoid using
1024+
``SO_REUSEADDR`` on Windows where it has different semantics.
10231025

10241026
- ``cheroot.tests.webtest`` adopts the one method that was unique
10251027
in CherryPy, now superseding the implementation there.
@@ -1150,12 +1152,14 @@ v5.6.0
11501152

11511153
``cheroot/test/*`` folder is only one left allowed to fail with this linter.
11521154

1153-
- :cp-issue:`1602` and :pr:`30`: Optimize chunked body reader loop by returning
1154-
empty data is the size is 0.
1155+
- :issue:`cherrypy/cherrypy#1602` and :pr:`30`: Optimize chunked
1156+
body reader loop by returning empty data is the size is 0.
11551157

1156-
- :cp-issue:`1486`: Reset buffer if the body size is unknown
1158+
- :issue:`cherrypy/cherrypy#1486`: Reset buffer if the body size
1159+
is unknown.
11571160

1158-
- :cp-issue:`1131`: Add missing size hint to SizeCheckWrapper
1161+
- :issue:`cherrypy/cherrypy#1131`: Add missing size
1162+
hint to ``SizeCheckWrapper``.
11591163

11601164

11611165
v5.5.2
@@ -1166,9 +1170,9 @@ v5.5.2
11661170
- :pr:`32`: Ignore ``"unknown error"`` and ``"https proxy request"``
11671171
SSL errors.
11681172

1169-
Ref: :gh:`sabnzbd/sabnzbd#820 <sabnzbd/sabnzbd/issues/820>`
1173+
Ref: :issue:`sabnzbd/sabnzbd#820`
11701174

1171-
Ref: :gh:`sabnzbd/sabnzbd#860 <sabnzbd/sabnzbd/issues/860>`
1175+
Ref: :issue:`sabnzbd/sabnzbd#860`
11721176

11731177

11741178
v5.5.1
@@ -1184,9 +1188,11 @@ v5.5.1
11841188

11851189
Move deploy stage to be run very last after all other stages finish.
11861190

1187-
- :pr:`31`: Ignore "Protocol wrong type for socket" (EPROTOTYPE) @ OSX for non-blocking sockets.
1191+
- :pr:`31`: Ignore "Protocol wrong type for socket" (``EPROTOTYPE``)
1192+
@ OSX for non-blocking sockets.
11881193

1189-
This was originally fixed for regular sockets in :cp-issue:`1392`.
1194+
This was originally fixed for regular sockets in
1195+
:issue:`cherrypy/cherrypy#1392`.
11901196

11911197
Ref: https://forums.sabnzbd.org/viewtopic.php?f=2&t=22728&p=112251
11921198

@@ -1277,5 +1283,5 @@ v5.0.0
12771283

12781284
*(2017-01-14)*
12791285

1280-
- Initial release based on :gh:`cherrypy.cherrypy.wsgiserver 8.8.0
1281-
<cherrypy/cherrypy/tree/v8.8.0/cherrypy/wsgiserver>`.
1286+
- Initial release based on `cherrypy.cherrypy.wsgiserver 8.8.0
1287+
<https://github.com/cherrypy/cherrypy/tree/v8.8.0/cherrypy/wsgiserver>`__.

dependencies/tox-docs.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ jaraco.packaging >= 9 # first version to load meta through PEP 517 interface
55
sphinx-tabs >= 1.1.0
66

77
furo
8+
sphinx-issues # Sphinx roles providing support for linking GitHub
89
sphinxcontrib-apidoc >= 0.3.0
910
sphinxcontrib-towncrier

docs/conf.py

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
'sphinx.ext.autodoc',
3333
'sphinx.ext.autosectionlabel', # autocreate section targets for refs
3434
'sphinx.ext.doctest',
35-
'sphinx.ext.extlinks',
3635
'sphinx.ext.intersphinx',
3736
# Third-party extensions:
3837
'jaraco.packaging.sphinx',
38+
'sphinx_issues', # implements `:issue:`, `:pr:` and other GH-related roles
3939
'sphinx_tabs.tabs',
4040
'sphinxcontrib.apidoc',
4141
'sphinxcontrib.towncrier.ext', # provides `.. towncrier-draft-entries::`
@@ -77,24 +77,6 @@
7777
'spelling_wordlist.txt',
7878
]
7979

80-
github_url = 'https://github.com'
81-
github_repo_org = 'cherrypy'
82-
github_repo_name = 'cheroot'
83-
github_repo_slug = f'{github_repo_org}/{github_repo_name}'
84-
github_repo_url = f'{github_url}/{github_repo_slug}'
85-
cp_github_repo_url = f'{github_url}/{github_repo_org}/cherrypy'
86-
github_sponsors_url = f'{github_url}/sponsors'
87-
88-
extlinks = {
89-
'issue': (f'{github_repo_url}/issues/%s', '#%s'),
90-
'pr': (f'{github_repo_url}/pull/%s', 'PR #%s'),
91-
'commit': (f'{github_repo_url}/commit/%s', '%s'),
92-
'cp-issue': (f'{cp_github_repo_url}/issues/%s', 'CherryPy #%s'),
93-
'cp-pr': (f'{cp_github_repo_url}/pull/%s', 'CherryPy PR #%s'),
94-
'gh': (f'{github_url}/%s', 'GitHub: %s'),
95-
'user': (f'{github_sponsors_url}/%s', '@%s'),
96-
}
97-
9880
intersphinx_mapping = {
9981
'python': ('https://docs.python.org/3', None),
10082
'python2': ('https://docs.python.org/2', None),

0 commit comments

Comments
 (0)