From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:32892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiR-0004kQ-7O for guix-patches@gnu.org; Sun, 12 May 2019 18:13:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPwiQ-0006qM-3F for guix-patches@gnu.org; Sun, 12 May 2019 18:13:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58339) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPwiP-0006p4-Ve for guix-patches@gnu.org; Sun, 12 May 2019 18:13:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hPwiP-0007yn-OF for guix-patches@gnu.org; Sun, 12 May 2019 18:13:05 -0400 Subject: [bug#35705] [PATCH 9/9] gnu: python-sphinx: Update to 2.0.1. Resent-Message-ID: From: Marius Bakke Date: Mon, 13 May 2019 00:12:21 +0200 Message-Id: <20190512221221.17781-9-mbakke@fastmail.com> In-Reply-To: <20190512221221.17781-1-mbakke@fastmail.com> References: <20190512221221.17781-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 35705@debbugs.gnu.org * 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: - ;; . - (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