jenkins-bot has submitted this change and it was merged.
Change subject: Upgrade docs dependency to sphinx-epytext-0.0.4
......................................................................
Upgrade docs dependency to sphinx-epytext-0.0.4
sphinx-epytext-0.0.4 fixes a bug allowing '@raise ..:' instead of
'@raises..:'
Also move the doc tox.ini rule above the tool preferences, and
use requests-requirements.txt
Change-Id: Ic084372d573a49deea6ee2dd00b235e08e6eef8d
---
M docs/requirements-py3.txt
M tox.ini
2 files changed, 10 insertions(+), 9 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/requirements-py3.txt b/docs/requirements-py3.txt
index f8b0450..c99a6f2 100644
--- a/docs/requirements-py3.txt
+++ b/docs/requirements-py3.txt
@@ -1,8 +1,7 @@
# This is a PIP requirements file for building Sphinx documentation of pywikibot
# using sphinx-1.3b1 on python3.4, and is used by
readthedocs.org.
+# requests-requirements.txt is also needed
sphinx==1.3.1
-sphinx-epytext>=0.0.3
+sphinx-epytext>=0.0.4
-# mandatory; see README.conversion.txt
-requests
diff --git a/tox.ini b/tox.ini
index 1bf0124..e4ece8e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -226,6 +226,14 @@
[testenv:venv]
commands = {posargs}
+[testenv:doc]
+changedir = docs
+commands = make html
+basepython = python3.4
+deps =
+ -rrequests-requirements.txt
+ -rdocs/requirements-py3.txt
+
[flake8]
ignore = E241,E402,E731,FI10,FI11,FI12,FI13,FI15,FI5,P102,P103
exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/*
@@ -237,9 +245,3 @@
ignore = E241,E402,E731
exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/*
max_line_length = 130
-
-[testenv:doc]
-changedir = docs
-commands = make html
-basepython = python3.4
-deps = -rdocs/requirements-py3.txt
--
To view, visit
https://gerrit.wikimedia.org/r/238600
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic084372d573a49deea6ee2dd00b235e08e6eef8d
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>