From patchwork Thu Jan 18 09:54:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Figiel X-Patchwork-Id: 59092 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 31F4F27BBE2; Thu, 18 Jan 2024 10:10:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EC91427BBE9 for ; Thu, 18 Jan 2024 10:10:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQPLW-0002O7-Nj; Thu, 18 Jan 2024 05:10:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQPLU-0002Nf-OB for guix-patches@gnu.org; Thu, 18 Jan 2024 05:10:00 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQPLU-0003oZ-Fm for guix-patches@gnu.org; Thu, 18 Jan 2024 05:10:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQPLV-0001xF-Vk for guix-patches@gnu.org; Thu, 18 Jan 2024 05:10:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68562] [PATCH 2/2] gnu: python-plotnine: Reformat with guix style. References: <87v87rt0su.fsf@troyfigiel.com> In-Reply-To: <87v87rt0su.fsf@troyfigiel.com> Resent-From: Troy Figiel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 Jan 2024 10:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68562 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68562@debbugs.gnu.org Received: via spool by 68562-submit@debbugs.gnu.org id=B68562.17055725467431 (code B ref 68562); Thu, 18 Jan 2024 10:10:01 +0000 Received: (at 68562) by debbugs.gnu.org; 18 Jan 2024 10:09:06 +0000 Received: from localhost ([127.0.0.1]:54373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQPKb-0001vk-Gn for submit@debbugs.gnu.org; Thu, 18 Jan 2024 05:09:06 -0500 Received: from mout-p-201.mailbox.org ([2001:67c:2050:0:465::201]:39720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQPKZ-0001v3-0H for 68562@debbugs.gnu.org; Thu, 18 Jan 2024 05:09:04 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4TFz3n02lsz9sWQ for <68562@debbugs.gnu.org>; Thu, 18 Jan 2024 11:08:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troyfigiel.com; s=MBO0001; t=1705572533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=EhJVaE7o4caeFcC9W/BJpCm2ywa83wBgWCtXm5S3uXI=; b=r2ZbhRGSohjaqrYnHvbUNKTTTnP6fcIZgftC4YHe/a5Ff+pnuxcyAyUzEwkdRLBtOZyRua cXdFNrTk27sIu5zI8tovf/sg1FNCHg47nkVlpKWJJ/E2OpeE5jLjzZF7M6jGRISZKrDlfi RwoJzckXVnKhRyVkjy9ke1rZsCGG3KvD3TG1ZwYNNNmt5sfo729NpXj5RAEhXiOy9E+d1v HfIVDwICB4bynS2t6UB6ML3o4ykEnFWFN46qkE7gpIRUN4abVc4RWCI+NrZzr60qPEZHmT Is4FJnlwA5PK71Qvhir7I7njshDEu7bpURscuOVmGqEIU4f8zntnJocRRlsIHQ== From: Troy Figiel Date: Thu, 18 Jan 2024 10:54:58 +0100 Message-ID: <87sf2vt0ln.fsf@troyfigiel.com> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-science.scm (python-plotnine): Reformat with guix style. --- gnu/packages/python-science.scm | 153 ++++++++++++++++---------------- 1 file changed, 76 insertions(+), 77 deletions(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 005ef6b016..6bdfeeb340 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -1744,89 +1744,88 @@ (define-public python-plotnine ;; XXX Version 0.12.x exists, but we can't build it because we're still at ;; matplotlib 3.5. We'd need at least 3.6. (version "0.10.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/has2k1/plotnine") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0lg53wcm00lj8zbb4q9yj4a0n0fqaqq7c7vj18bda0k56gg0fpwl")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/has2k1/plotnine") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0lg53wcm00lj8zbb4q9yj4a0n0fqaqq7c7vj18bda0k56gg0fpwl")))) (build-system pyproject-build-system) (arguments (list #:test-flags ;; These all fail because the images are considered to be too different, ;; though they really do look fine. - '(list "-k" (string-append - "not TestThemes" - (string-join - (list - ;; Image tests - "test_adjust_text" - "test_annotation_logticks_coord_flip_discrete" - "test_annotation_logticks_faceting" - "test_arrow" - "test_aslabeller_dict_0tag" - "test_caption_simple" - "test_continuous_x" - "test_continuous_x_fullrange" - "test_coord_trans_backtransforms" - "test_coord_trans_se_false" - "test_custom_shape" - "test_datetime_scale_limits" - "test_dir_v_ncol" - "test_discrete_x" - "test_discrete_x_fullrange" - "test_facet_grid_drop_false" - "test_facet_grid_expression" - "test_facet_grid_space_ratios" - "test_facet_wrap" - "test_facet_wrap_expression" - "test_facet_wrap_label_both" - "test_label_context_wrap2vars" - "test_labeller_cols_both_grid" - "test_labeller_cols_both_wrap" - "test_labeller_towords" - "test_missing_data_discrete_scale" - "test_ribbon_facetting" - "test_stack_non_linear_scale" - "test_uneven_num_of_lines" - - ;; Missing optional modules - "test_non_linear_smooth" - "test_non_linear_smooth_no_ci") - " and not " 'prefix))) - #:phases - '(modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; The data files are referenced by the tests but they are not - ;; installed. - (copy-recursively "plotnine/data" - (string-append (site-packages inputs outputs) - "/plotnine/data")) - ;; Matplotlib needs to be able to write its configuration file - ;; somewhere. - (setenv "MPLCONFIGDIR" "/tmp") - (setenv "TZ" "UTC") - (setenv "TZDIR" - (search-input-directory inputs "share/zoneinfo"))))))) - (propagated-inputs - (list python-adjusttext - python-matplotlib - python-mizani - python-numpy - python-patsy - python-scipy - python-statsmodels)) - (native-inputs - (list python-geopandas - python-mock - python-pandas - python-pytest python-pytest-cov - tzdata-for-tests)) + '(list "-k" + (string-append "not TestThemes" + (string-join (list + ;; Image tests + "test_adjust_text" + "test_annotation_logticks_coord_flip_discrete" + "test_annotation_logticks_faceting" + "test_arrow" + "test_aslabeller_dict_0tag" + "test_caption_simple" + "test_continuous_x" + "test_continuous_x_fullrange" + "test_coord_trans_backtransforms" + "test_coord_trans_se_false" + "test_custom_shape" + "test_datetime_scale_limits" + "test_dir_v_ncol" + "test_discrete_x" + "test_discrete_x_fullrange" + "test_facet_grid_drop_false" + "test_facet_grid_expression" + "test_facet_grid_space_ratios" + "test_facet_wrap" + "test_facet_wrap_expression" + "test_facet_wrap_label_both" + "test_label_context_wrap2vars" + "test_labeller_cols_both_grid" + "test_labeller_cols_both_wrap" + "test_labeller_towords" + "test_missing_data_discrete_scale" + "test_ribbon_facetting" + "test_stack_non_linear_scale" + "test_uneven_num_of_lines" + + ;; Missing optional modules + "test_non_linear_smooth" + "test_non_linear_smooth_no_ci") + " and not " + 'prefix))) + #:phases '(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; The data files are referenced by the tests but they are not + ;; installed. + (copy-recursively "plotnine/data" + (string-append (site-packages inputs + outputs) + "/plotnine/data")) + ;; Matplotlib needs to be able to write its configuration file + ;; somewhere. + (setenv "MPLCONFIGDIR" "/tmp") + (setenv "TZ" "UTC") + (setenv "TZDIR" + (search-input-directory inputs "share/zoneinfo"))))))) + (propagated-inputs (list python-adjusttext + python-matplotlib + python-mizani + python-numpy + python-patsy + python-scipy + python-statsmodels)) + (native-inputs (list python-geopandas + python-mock + python-pandas + python-pytest + python-pytest-cov + tzdata-for-tests)) (home-page "https://github.com/has2k1/plotnine") (synopsis "Grammar of Graphics for Python") (description