From patchwork Sun May 12 22:12:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 13969 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 10CD216FD6; Sun, 12 May 2019 23:13:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 92C5D16FD2 for ; Sun, 12 May 2019 23:13:14 +0100 (BST) Received: from localhost ([127.0.0.1]:47853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiX-0004mU-49 for patchwork@mira.cbaines.net; Sun, 12 May 2019 18:13:13 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#35705] [PATCH 9/9] gnu: python-sphinx: Update to 2.0.1. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2019 22:13:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35705 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35705@debbugs.gnu.org Received: via spool by 35705-submit@debbugs.gnu.org id=B35705.155769917530602 (code B ref 35705); Sun, 12 May 2019 22:13:05 +0000 Received: (at 35705) by debbugs.gnu.org; 12 May 2019 22:12:55 +0000 Received: from localhost ([127.0.0.1]:43643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwiB-0007xO-QU for submit@debbugs.gnu.org; Sun, 12 May 2019 18:12:55 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:56687) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwi1-0007vz-Ay for 35705@debbugs.gnu.org; Sun, 12 May 2019 18:12:41 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4C33B2104A for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:36 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 12 May 2019 18:12:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=ph0LOa3Vd31Ih hU8JgNkhYmKUjLrZ846DzJ7zUF1tiE=; b=CqYKMiuuPnZlaD7pRcpaHoIbvYXZ7 BNKX/H4Nlth9U5l0kafY8tCCIYMkjPOCTylpfIpgoCB81L03uaipd4cHjh+nONqb 3wSxP3u2/IgY8Se1LJf97Vwr5g5uIA5hZZXPEhjq3c7ense0ybH1q9HUcBAKs1Zm 6yjWLTWLcBOCl3tsdqLuVZYkDeBJnsujAo6httHNyk+cNgGxT7BiKh4DbySVvpzS XOriBf5FJP/r69lEuhLHJ/uHBc+uvnwXY/4bqy1XozbBjt8p8EX5m3HeEWe3Q4vE 2PsdUgMALlKfeoL3dRlTazve0IwHuqrC39oZsGlN+2tRMo/PkPS+CdV5g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=ph0LOa3Vd31IhhU8JgNkhYmKUjLrZ846DzJ7zUF1tiE=; b=XxrUnL+B wG3HwRl96xzHlKHMaQEqFmHQlSVb4mu36OF94C5xNOAHy+9hbJiMlE+1S7ZKEzS1 bTu1BXeUp+x+JssGuXOAY3WsXd2hdPvV4eO6w4yD85l+kVpOnvdeWXIQDEIwgY2L NT5Qxy/wndk5+0nwbfbsDfvlYsa4Ir/wdrNySonZ9hJWdLF+8SAAPmJP4E/azpTP aI2jt3RLA5JX+iwgyvJIvQcus8Fcy9QOR2+AVsOSng2DFztwfsutNScFctFt36uw ciBPC6MhKnSO38RzHFOkfAIGji9M4/QMRSqKpeeb+kh9BzOt0rescBXcbJJejFcD L7KtyVsf0Rl5bA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrleefgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeeivd drudeirddvvdeirddugedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmsggrkhhkvges fhgrshhtmhgrihhlrdgtohhmnecuvehluhhsthgvrhfuihiivgepvd X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id A43F38005C for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:35 -0400 (EDT) From: Marius Bakke Date: Mon, 13 May 2019 00:12:21 +0200 Message-Id: <20190512221221.17781-9-mbakke@fastmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190512221221.17781-1-mbakke@fastmail.com> References: <20190512221221.17781-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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"