From: Marius Bakke <mbakke@fastmail.com>
To: 35705@debbugs.gnu.org
Subject: [bug#35705] [PATCH 9/9] gnu: python-sphinx: Update to 2.0.1.
Date: Mon, 13 May 2019 00:12:21 +0200 [thread overview]
Message-ID: <20190512221221.17781-9-mbakke@fastmail.com> (raw)
In-Reply-To: <20190512221221.17781-1-mbakke@fastmail.com>
* gnu/packages/sphinx.scm (python-sphinx): Update to 2.0.1.
[arguments]: Remove Python2 workaround.
[propagated-inputs]: Remove PYTHON-SIX and PYTHON-SPHINXCONTRIB-WEBSUPPORT.
Add PYTHON-SPHINXCONTRIB-APPLEHELP, PYTHON-SPHINXCONTRIB-DEVHELP,
PYTHON-SPHINXCONTRIB-HTMLHELP, PYTHON-SPHINXCONTRIB-JSMATH,
PYTHON-SPHINXCONTRIB-QTHELP, and PYTHON-SPHINXCONTRIB-SERIALIZINGHTML.
---
gnu/packages/sphinx.scm | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 68cd158a3b..eae7eee654 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -43,14 +43,14 @@
(define-public python-sphinx
(package
(name "python-sphinx")
- (version "1.7.7")
+ (version "2.0.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Sphinx" version))
(sha256
(base32
- "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi"))))
+ "0js0rnbzm0nsb4gm2v4z79wlbmr05awqzic57kfl8ydkdxj80cj2"))))
(build-system python-build-system)
(arguments
`(#:phases
@@ -62,11 +62,6 @@
(substitute* "tests/test_build_latex.py"
(("@pytest.mark.sphinx\\('latex', testroot='images'\\)")
"@pytest.mark.skip()"))
- (when (which "python")
- ;; XXX: These tests are broken when using Python2:
- ;; <https://github.com/sphinx-doc/sphinx/issues/4710>.
- (delete-file "tests/test_api_translator.py")
- (delete-file "tests/test_setup_command.py"))
(invoke "make" "test"))))))
(propagated-inputs
`(("python-imagesize" ,python-imagesize)
@@ -79,8 +74,13 @@
("python-packaging" ,python-packaging)
("python-pygments" ,python-pygments)
("python-requests" ,python-requests)
- ("python-six" ,python-six)
- ("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport)))
+ ("python-sphinxcontrib-applehelp" ,python-sphinxcontrib-applehelp)
+ ("python-sphinxcontrib-devhelp" ,python-sphinxcontrib-devhelp)
+ ("python-sphinxcontrib-htmlhelp" ,python-sphinxcontrib-htmlhelp)
+ ("python-sphinxcontrib-jsmath" ,python-sphinxcontrib-jsmath)
+ ("python-sphinxcontrib-qthelp" ,python-sphinxcontrib-qthelp)
+ ("python-sphinxcontrib-serializinghtml"
+ ,python-sphinxcontrib-serializinghtml)))
(native-inputs
`(("graphviz" ,graphviz)
("imagemagick" ,imagemagick) ;for "convert"
--
2.21.0
next prev parent reply other threads:[~2019-05-12 22:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-12 22:09 [bug#35705] [PATCH 0/9] Sphinx 2.0 Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 1/9] gnu: Move Sphinx and friends to (gnu packages sphinx) Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 2/9] gnu: Remove python2-sphinx Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 3/9] gnu: Add python-sphinxcontrib-serializinghtml Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 4/9] gnu: Add python-sphinxcontrib-applehelp Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 5/9] gnu: Add python-sphinxcontrib-devhelp Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 6/9] gnu: Add python-sphinxcontrib-jsmath Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 7/9] gnu: Add python-sphinxcontrib-htmlhelp Marius Bakke
2019-05-12 22:12 ` [bug#35705] [PATCH 8/9] gnu: Add python-sphinxcontrib-qthelp Marius Bakke
2019-05-12 22:12 ` Marius Bakke [this message]
2019-05-14 21:23 ` [bug#35705] [PATCH 0/9] Sphinx 2.0 Ricardo Wurmus
2019-05-25 10:56 ` bug#35705: " Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190512221221.17781-9-mbakke@fastmail.com \
--to=mbakke@fastmail.com \
--cc=35705@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.