Skip to content

Commit

Permalink
upgrade Sphinx >= 5
Browse files Browse the repository at this point in the history
fix warnings: update extlinks format to Sphinx 5
  • Loading branch information
andreasabel authored and mergify[bot] committed Jun 8, 2022
1 parent adc6706 commit 3de4b62
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
8 changes: 4 additions & 4 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@

# extlinks -- see http://www.sphinx-doc.org/en/stable/ext/extlinks.html
extlinks = {
'issue': ('https://github.com/haskell/cabal/issues/%s', '#'),
'issue': ('https://github.com/haskell/cabal/issues/%s', 'issue #%s'),

'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/-/wikis/%s', ''),
'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/-/issues/%s', 'GHC #'),
'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/-/wikis/%s', '%s'),
'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/-/issues/%s', 'GHC issue #%s'),

'hackage-pkg': ('http://hackage.haskell.org/package/%s', ''),
'hackage-pkg': ('http://hackage.haskell.org/package/%s', '%s'),
}

# General information about the project.
Expand Down
4 changes: 2 additions & 2 deletions doc/requirements.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sphinx >= 3.1
sphinx_rtd_theme
sphinx >= 5
sphinx_rtd_theme >= 1
sphinx-jsonschema
# Pygments>=2.7.4 suggested by CVE-2021-20270 CVE-2021-27291
Pygments >= 2.7.4
9 changes: 5 additions & 4 deletions doc/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ idna==2.10
# via requests
imagesize==1.2.0
# via sphinx
importlib-metadata==4.11.4
# via sphinx
jinja2==2.11.3
# via sphinx
jsonpointer==2.1
Expand All @@ -45,7 +47,7 @@ requests==2.26.0
# sphinx-jsonschema
snowballstemmer==2.1.0
# via sphinx
sphinx==4.2.0
sphinx==5.0.1
# via
# -r requirements.in
# sphinx-rtd-theme
Expand All @@ -67,6 +69,5 @@ sphinxcontrib-serializinghtml==1.1.5
# via sphinx
urllib3==1.26.7
# via requests

# The following packages are considered to be unsafe in a requirements file:
# setuptools
zipp==3.8.0
# via importlib-metadata

0 comments on commit 3de4b62

Please sign in to comment.