Merge pull request #1728 from aucampia/iwana-20220226T2130-autodoc_ty…

…pehints_both Enable showing typehints in sphinx function/method signature and content
RDFLib · Mar 14, 2022 · 1fdf40c · 1fdf40c
2 parents 6bdb576 + d0cf3eb
commit 1fdf40c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -43,6 +43,7 @@
 apidoc_module_dir = "../rdflib"
 apidoc_output_dir = "apidocs"
 autodoc_default_options = {"special-members": True}
+autodoc_typehints = "both"
 
 autosummary_generate = True
 

diff --git a/docs/sphinx-requirements.txt b/docs/sphinx-requirements.txt
@@ -1,5 +1,5 @@
-sphinx==4.4.0
-sphinxcontrib-apidoc
 git+https://github.com/gniezen/n3pygments.git
 myst-parser
+sphinx<5
+sphinxcontrib-apidoc
 sphinxcontrib-kroki
diff --git a/requirements.dev.txt b/requirements.dev.txt
@@ -4,13 +4,13 @@ doctest-ignore-unicode==0.1.2
 flake8
 flake8-black
 html5lib
+isort
 mypy
 myst-parser
 pytest
 pytest-cov
 pytest-subtests
-isort
-sphinx
+sphinx<5
 sphinxcontrib-apidoc
 sphinxcontrib-kroki
 types-setuptools
diff --git a/setup.py b/setup.py
@@ -25,9 +25,9 @@
     "html": ["html5lib"],
     "tests": kwargs["tests_require"],
     "docs": [
+        "myst-parser",
         "sphinx < 5",
         "sphinxcontrib-apidoc",
-        "myst-parser",
         "sphinxcontrib-kroki",
     ],
 }