From patchwork Sun May 30 04:05:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 29676 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 A651F27BC81; Sun, 30 May 2021 05:07:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1689F27BC78 for ; Sun, 30 May 2021 05:07:30 +0100 (BST) Received: from localhost ([::1]:35564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lnCjZ-0002XL-75 for patchwork@mira.cbaines.net; Sun, 30 May 2021 00:07:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnCj8-0002Uz-UE for guix-patches@gnu.org; Sun, 30 May 2021 00:07:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46494) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lnCj8-0004We-LX for guix-patches@gnu.org; Sun, 30 May 2021 00:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lnCj8-0007Jq-FX for guix-patches@gnu.org; Sun, 30 May 2021 00:07:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48737] [PATCH] gnu: python-sphinx-gallery: Update to 0.9.0. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 May 2021 04:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48737 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48737@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162234757828076 (code B ref -1); Sun, 30 May 2021 04:07:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 May 2021 04:06:18 +0000 Received: from localhost ([127.0.0.1]:58039 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnCiJ-0007Ig-Iy for submit@debbugs.gnu.org; Sun, 30 May 2021 00:06:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:50266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lnCiF-0007IV-1z for submit@debbugs.gnu.org; Sun, 30 May 2021 00:06:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnCiE-0001kF-L0 for guix-patches@gnu.org; Sun, 30 May 2021 00:06:06 -0400 Received: from mout01.posteo.de ([185.67.36.65]:56129) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lnCiA-0003sI-Ct for guix-patches@gnu.org; Sun, 30 May 2021 00:06:06 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id DF3F8240026 for ; Sun, 30 May 2021 06:05:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622347557; bh=hy4FmvhRBZBuP3XoYByhtsKOfFrfzV2NvR75DNO826M=; h=From:To:Cc:Subject:Date:From; b=AFn3mJwZ9GGqVioaZOR+mzi5pU6GfWTkSIlQIYfYPe/ZLehcOgy09HZOm/K42KOBL 78nPhWl26WBDNFUKpCtE8uadhWg4rL6mTp4fw0eW+lUWpvozPAD1Fgvx2faAGkw5MT 4Co6ngFvJg8NnF76pSZFnOF7wk3HK/g/1UDZ3039RXvqn8WoH7MDLJDBH/9xXMz1Gj zjZHJmHMZRPxR18fnqdcI2n4f+iCIxySevdVHcuwjN/jXPIx7UVayAO+zzrR7PEevs H01czQqr8q9VVRRpP6bgmg0XbWxrrO9pKrNGLN2DRBB4rxXU1XiXRV/gn7ybUqhk0L YAMliTubcXbsw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ft4bS1Nhvz6tm6; Sun, 30 May 2021 06:05:55 +0200 (CEST) From: Vinicius Monego Date: Sun, 30 May 2021 04:05:16 +0000 Message-Id: <20210530040516.84257-1-monego@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=monego@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-gallery): Update to 0.9.0. [source]: Build from PyPI. [arguments]: Remove #:tests?. Add #:phases. [native-inputs]: Add python-joblib, python-matplotlib, python-numpy, python-pillow, python-pytest, python-pytest-cov, python-sphinx. Remove python-pytest-runner. [home-page]: Follow redirect. (python2-sphinx-gallery): Remove package. --- I didn't try to rebuild python-matplotlib-documentation which is the only dependent. gnu/packages/sphinx.scm | 51 ++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 14bc3f5a79..428a701d87 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 Eric Bavier +;;; Copyright © 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -409,34 +410,46 @@ integrate Sphinx documents in web templates and to handle searches.") (define-public python-sphinx-gallery (package (name "python-sphinx-gallery") - (version "0.1.13") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sphinx-gallery/sphinx-gallery") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "14nbqh9krx2l2y2ylbln6l6w8iak3wac1lngvaf278y1cx7685kg")))) + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sphinx-gallery" version)) + (sha256 + (base32 "14zyhr7m92nafhhnzfvnbgkf5m91krd9mjyi24zn59bjq6zyr8hl")))) (build-system python-build-system) (arguments - ;; FIXME: Tests attempt to download , - ;; , and - ;; . - `(#:tests? #f)) + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'writable-files-for-tests + (lambda _ + (for-each make-file-writable (find-files ".")))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "python" "-m" "pytest" "--pyargs" "sphinx_gallery" "-k" + (string-append + ;; These tests require online data. + "not test_embed_code_links_get_data" + " and not test_run_sphinx" + ;; AssertionError. + " and not test_embed_links_and_styles")))))))) (native-inputs - `(("python-pytest-runner" ,python-pytest-runner))) - (home-page "https://sphinx-gallery.github.io/") + `(("python-joblib" ,python-joblib) + ("python-matplotlib" ,python-matplotlib) + ("python-numpy" ,python-numpy) + ("python-pillow" ,python-pillow) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-sphinx" ,python-sphinx))) + (home-page "https://sphinx-gallery.github.io/stable/index.html") (synopsis "Generate an examples gallery automatically") (description "@code{sphinx_gallery} is a Sphinx extension that builds an HTML version 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")