From patchwork Sun May 12 22:12:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 13968 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 A4F9F16FD6; Sun, 12 May 2019 23:13:13 +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 0F59D16FD2 for ; Sun, 12 May 2019 23:13:13 +0100 (BST) Received: from localhost ([127.0.0.1]:47851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiT-0004lr-B2 for patchwork@mira.cbaines.net; Sun, 12 May 2019 18:13:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hPwiP-0004jb-BY for guix-patches@gnu.org; Sun, 12 May 2019 18:13:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hPwiM-0006bt-L1 for guix-patches@gnu.org; Sun, 12 May 2019 18:13:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58333) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hPwiM-0006af-H1 for guix-patches@gnu.org; Sun, 12 May 2019 18:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hPwiM-0007xy-BP for guix-patches@gnu.org; Sun, 12 May 2019 18:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35705] [PATCH 2/9] gnu: Remove python2-sphinx. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 12 May 2019 22:13:02 +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.155769916730545 (code B ref 35705); Sun, 12 May 2019 22:13:02 +0000 Received: (at 35705) by debbugs.gnu.org; 12 May 2019 22:12:47 +0000 Received: from localhost ([127.0.0.1]:43629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwi6-0007wW-8i for submit@debbugs.gnu.org; Sun, 12 May 2019 18:12:46 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:49009) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hPwhr-0007vH-Lt for 35705@debbugs.gnu.org; Sun, 12 May 2019 18:12:32 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 4E69E2104A for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:25 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sun, 12 May 2019 18:12:25 -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=P7Hso7sbiCa8e NaL9nQ4Oy7+RkqHbhcR/+TFGHZolwE=; b=jgCgOoPrcjU8OGcKmkCaypN7+IsIc hPVLfedyTpPt5tIWvAYW6OoySzw2FEV/pKAytegywgiQQ44GIIc0ugo2KScPM5/E SSib/yyfQyOuD/Qd8ocIZ5anlrK/jcQSbt3XdNkUB/fm9QFC4tZJy1o6KOmHbHsg otKMMZQGUQqTj2E0qyDgd7sP1GCnXkAMAwebtNSRmEry7BIJo4rvNfyZxz9tqzPt 7OIqNknHFSZkTM+MmkxPAzqPMECJvdlfTa53fGmrbhLJgO6FoE+OLHsiXD9B37DZ y4FcCtuEnsv9CTeZGJjFv4U3X8SW6lCW41iEQhnDl3MNhrFb0KYJSGTbw== 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=P7Hso7sbiCa8eNaL9nQ4Oy7+RkqHbhcR/+TFGHZolwE=; b=3lL6IS5E xd+j5ToPhMEi+n7km7+DKo1SdNgCCi/il5911KZUdJcaBQnw4MtCwNPQUAc2OgjR ajiiHvVcOy6vKPK0tFWUg7BQwj5chyhm8ogy0lhvt2W83f4NSVlIs29+BAxVEX+0 TDlNOwOf6U1DgmhsUg0BEJmYu0AxlULMq/x61e2mw8tlILRDmuvY+3K593OSblai qiQ10E12C6XD4h60eK9xSlheJsQEkxVimARsK4vBOmX7yh2UnBeZMmKa6qhmrlcN RBmEPRmy48Fgl5ky7HO3LC5devD6un7+kNHM2ywDRggKiGZPGjXY++fYXOwAc8Up fsnKEpjStOB5bg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrleefgddthecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecuogfuuhhsphgvtghtffhomhgrihhnucdlgeelmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepofgrrhhiuhhs uceurghkkhgvuceomhgsrghkkhgvsehfrghsthhmrghilhdrtghomheqnecuffhomhgrih hnpehrvggrughthhgvughotghsrdhorhhgpdhguhiiiihlvghphhhprdhorhhgpdhgihht hhhusgdrihhopdhgihhthhhusgdrtghomhenucfkphepiedvrdduiedrvddviedrudegtd enucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtgho mhenucevlhhushhtvghrufhiiigvpedt 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 A474680061 for <35705@debbugs.gnu.org>; Sun, 12 May 2019 18:12:24 -0400 (EDT) From: Marius Bakke Date: Mon, 13 May 2019 00:12:14 +0200 Message-Id: <20190512221221.17781-2-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/bioinformatics.scm (python2-pbcore)[native-inputs]: Change from PYTHON2-SPHINX to PYTHON-SPHINX. * gnu/packages/image.scm (vigra)[native-inputs]: Likewise. * gnu/packages/mail.scm (notmuch)[native-inputs]: Likewise. * gnu/packages/web.scm (python2-httpretty)[native-inputs]: Likewise. Remove unnecessary PYTHON2-SPHINX-RTD-THEME. * gnu/packages/sphinx.scm (sphinx)[properties]: Remove field. (python2-sphinx, python2-sphinxcontrib-newsfeed, python2-sphinxcontrib-programoutput, python2-sphinx-gallery, python2-sphinx-repoze-autointerface, python2-sphinx-alabaster-theme, python2-sphinx-cloud-sptheme, python2-guzzle-sphinx-theme, python2-sphinx-me, python2-sphinx-rtd-theme): Remove variables. --- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/image.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/sphinx.scm | 44 ++------------------------------- gnu/packages/web.scm | 4 +-- 5 files changed, 7 insertions(+), 47 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0685ca966b..0aa9d97617 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -4729,7 +4729,7 @@ interrupted by stop codons. OrfM finds and prints these ORFs.") ("python-h5py" ,python2-h5py))) (native-inputs `(("python-nose" ,python2-nose) - ("python-sphinx" ,python2-sphinx) + ("sphinx" ,python-sphinx) ("python-pyxb" ,python2-pyxb))) (home-page "http://pacificbiosciences.github.io/pbcore/") (synopsis "Library for reading and writing PacBio data files") diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 528f1dcdcb..443457da43 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -894,7 +894,7 @@ graphics image formats like PNG, BMP, JPEG, TIFF and others.") (native-inputs `(("doxygen" ,doxygen) ("python2-nose" ,python2-nose) - ("python2-sphinx" ,python2-sphinx))) + ("sphinx" ,python-sphinx))) (arguments `(#:test-target "check" #:phases diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index aeac81d072..8e3a676ce1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -898,7 +898,7 @@ invoking @command{notifymuch} from the post-new hook.") ("pkg-config" ,pkg-config) ("python" ,python-2) ("python-docutils" ,python2-docutils) - ("python-sphinx" ,python2-sphinx) + ("sphinx" ,python-sphinx) ;; The following are required for tests only. ("which" ,which) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 088f0d3b38..82a0df2499 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -38,8 +38,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages python-web) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages time)) + #:use-module (gnu packages python-xyz)) (define-public python-sphinx (package @@ -94,19 +93,7 @@ (description "Sphinx is a tool that makes it easy to create documentation for Python projects or other documents consisting of multiple reStructuredText sources.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-sphinx)))))) - -(define-public python2-sphinx - (let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) - (package - (inherit base) - (native-inputs `(("python2-mock" ,python2-mock) - ("python2-enum34" ,python2-enum34) - ,@(package-native-inputs base))) - (propagated-inputs `(("python2-pytz" ,python2-pytz) - ("python2-typing" ,python2-typing) - ,@(package-propagated-inputs base)))))) + (license license:bsd-3))) (define-public python-sphinxcontrib-newsfeed (package @@ -150,9 +137,6 @@ commands into documents, helping you to keep your command examples up to date.") (home-page "https://github.com/lunaryorn/sphinxcontrib-programoutput") (license license:bsd-2))) -(define-public python2-sphinxcontrib-programoutput - (package-with-python2 python-sphinxcontrib-programoutput)) - (define-public python-sphinxcontrib-svg2pdfconverter (package (name "python-sphinxcontrib-svg2pdfconverter") @@ -193,9 +177,6 @@ Sphinx documentation into your web application. It provides tools to integrate Sphinx documents in web templates and to handle searches.") (license license:bsd-3))) -(define-public python2-sphinxcontrib-websupport - (package-with-python2 python-sphinxcontrib-websupport)) - (define-public python-sphinx-gallery (package (name "python-sphinx-gallery") @@ -223,9 +204,6 @@ integrate Sphinx documents in web templates and to handle searches.") from any set of Python scripts and puts it into an examples gallery.") (license license:bsd-3))) -(define-public python2-sphinx-gallery - (package-with-python2 python-sphinx-gallery)) - (define-public python-sphinx-me (package (name "python-sphinx-me") @@ -269,9 +247,6 @@ introspection of @code{zope.interface} instances in code.") (home-page "https://github.com/repoze/repoze.sphinx.autointerface") (license license:repoze))) -(define-public python2-sphinx-repoze-autointerface - (package-with-python2 python-sphinx-repoze-autointerface)) - (define-public python-sphinx-alabaster-theme (package (name "python-sphinx-alabaster-theme") @@ -291,9 +266,6 @@ introspection of @code{zope.interface} instances in code.") theme for the Sphinx documentation system. It's the default theme of Sphinx.") (license license:bsd-3))) -(define-public python2-sphinx-alabaster-theme - (package-with-python2 python-sphinx-alabaster-theme)) - (define-public python-sphinx-cloud-sptheme (package (name "python-sphinx-cloud-sptheme") @@ -315,9 +287,6 @@ theme for the Sphinx documentation system. It's the default theme of Sphinx.") related extensions.") (license license:bsd-3))) -(define-public python2-sphinx-cloud-sptheme - (package-with-python2 python-sphinx-cloud-sptheme)) - (define-public python-guzzle-sphinx-theme (package (name "python-guzzle-sphinx-theme") @@ -339,9 +308,6 @@ Sphinx documentation system, used by @uref{http://docs.guzzlephp.org, Guzzle} and several other projects.") (license license:expat))) -(define-public python2-guzzle-sphinx-theme - (package-with-python2 python-guzzle-sphinx-theme)) - (define-public python-sphinx-rtd-theme (package (name "python-sphinx-rtd-theme") @@ -361,9 +327,3 @@ and several other projects.") (synopsis "ReadTheDocs.org theme for Sphinx") (description "A theme for Sphinx used by ReadTheDocs.org.") (license license:expat))) - -(define-public python2-sphinx-rtd-theme - (package-with-python2 python-sphinx-rtd-theme)) - -(define-public python2-sphinx-me - (package-with-python2 python-sphinx-me)) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index fd38a6bf00..3870ca8329 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5228,8 +5228,8 @@ inspired by Ruby's @code{fakeweb}.") "0vlp5qkyw3pxwwsg7xmdcfh1csvypvaz4m6abida8s4xmjxpdhc3")))) (build-system python-build-system) (native-inputs - `(("python-sphinx-rtd-theme" ,python2-sphinx-rtd-theme) - ("python-sphinx" ,python2-sphinx) + `(("sphinx" ,python-sphinx) + ("python-coverage" ,python2-coverage) ("python-tornado" ,python2-tornado) ("python-urllib3" ,python2-urllib3)