Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/838228 )
Change subject: [sphinx] Do not use sphinx 5.2 ......................................................................
[sphinx] Do not use sphinx 5.2
sphinx 5.2 shows any module classes, methods and functions in the side bar which shouldn't. 5.1.1 only displays the headers.
Change-Id: I7d3ad6ce6389cfddd6413336c9cf70896536bf35 --- M docs/requirements-py3.txt M setup.py M tox.ini 3 files changed, 15 insertions(+), 8 deletions(-)
Approvals: jenkins-bot: Verified Xqt: Verified; Looks good to me, approved
diff --git a/docs/requirements-py3.txt b/docs/requirements-py3.txt index 53d9a1f..f079137 100644 --- a/docs/requirements-py3.txt +++ b/docs/requirements-py3.txt @@ -1,5 +1,5 @@ # This is a PIP requirements file for building Sphinx documentation of pywikibot # requirements.txt is also needed
-sphinx >= 5.1.1 +sphinx == 5.1.1 rstcheck >=3.5.0 \ No newline at end of file diff --git a/setup.py b/setup.py index fe66a45..c1e9957 100755 --- a/setup.py +++ b/setup.py @@ -94,7 +94,12 @@ 'pep8-naming>=0.12.1, <0.13.0; python_version < "3.7"', 'pep8-naming>=0.12.1; python_version >= "3.7"', ], - 'hacking': ['hacking'], + 'hacking': [ + 'hacking', + # importlib-metadata module already installed with hacking 4.1.0 + # but importlib-metadata 5.0.0 fails, so adjust it + 'importlib-metadata!=5.0.0', + ], }
diff --git a/tox.ini b/tox.ini index 6a83292..4f0e1f0 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,10 @@ hacking-py37
[params] -doctest_skip = --ignore-files=gui.py +# gui needs tkinter +doctest_skip = + --ignore-glob="*gui.py" + --ignore-glob="*memento.py" exclude = --exclude make_dist.py,.tox,.git,./*.egg,build,./scripts/i18n/* generate_user_files = -W error::UserWarning -m pwb generate_user_files -family:wikipedia -lang:test -v
@@ -65,12 +68,11 @@ basepython = python3 commands = python {[params]generate_user_files} - nosetests --version - nosetests -v --with-doctest pywikibot {[params]doctest_skip} + pytest --version + pytest pywikibot --doctest-modules {[params]doctest_skip} deps = - nose + pytest >= 7.0.1 .[eventstreams] - .[memento] .[mwparserfromhell] .[mysql]
@@ -80,7 +82,7 @@ [testenv:doc] commands = sphinx-build -M html ./docs ./docs/_build - rstcheck --recursive --report warning --ignore-roles phab . + rstcheck --recursive --report warning --ignore-roles api,phab . basepython = python3.6 deps = -rrequirements.txt