all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#68562] [PATCH 1/2] gnu: python-plotnine: Fix build.
  2024-01-18 10:01 [bug#68562] [PATCH 0/2] Fix python-plotnine build Troy Figiel
@ 2024-01-18  9:43 ` Troy Figiel
  2024-01-18  9:54 ` [bug#68562] [PATCH 2/2] gnu: python-plotnine: Reformat with guix style Troy Figiel
  2024-01-18 21:08 ` bug#68562: [PATCH 0/2] Fix python-plotnine build Sharlatan Hellseher
  2 siblings, 0 replies; 4+ messages in thread
From: Troy Figiel @ 2024-01-18  9:43 UTC (permalink / raw)
  To: 68562

* gnu/packages/python-science.scm (python-plotnine): Fix build.
[arguments]<#:test-flags>: Add test_custom_shape to ignored tests.
---
 gnu/packages/python-science.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index c57fd1f23c..005ef6b016 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -1774,6 +1774,7 @@ (define-public python-plotnine
                      "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"
-- 
2.42.0





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#68562] [PATCH 2/2] gnu: python-plotnine: Reformat with guix style.
  2024-01-18 10:01 [bug#68562] [PATCH 0/2] Fix python-plotnine build Troy Figiel
  2024-01-18  9:43 ` [bug#68562] [PATCH 1/2] gnu: python-plotnine: Fix build Troy Figiel
@ 2024-01-18  9:54 ` Troy Figiel
  2024-01-18 21:08 ` bug#68562: [PATCH 0/2] Fix python-plotnine build Sharlatan Hellseher
  2 siblings, 0 replies; 4+ messages in thread
From: Troy Figiel @ 2024-01-18  9:54 UTC (permalink / raw)
  To: 68562

* 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
-- 
2.42.0





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#68562] [PATCH 0/2] Fix python-plotnine build
@ 2024-01-18 10:01 Troy Figiel
  2024-01-18  9:43 ` [bug#68562] [PATCH 1/2] gnu: python-plotnine: Fix build Troy Figiel
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Troy Figiel @ 2024-01-18 10:01 UTC (permalink / raw)
  To: 68562

I checked manually and the images look very similar again. It seems the
letters in the image are shifted slightly to the right as compared to the
expectation, which could be caused by different versions of Guix dependencies
as compared to the upstream project.

I am aware we can upgrade this package, but doing so will break a bunch more tests. I would like to at least have a buildable package for now.

Troy Figiel (2):
  gnu: python-plotnine: Fix build.
  gnu: python-plotnine: Reformat with guix style.

 gnu/packages/python-science.scm | 152 ++++++++++++++++----------------
 1 file changed, 76 insertions(+), 76 deletions(-)


base-commit: c49957de727746df47e0f0b86bc1c797e68167e6
-- 
2.42.0





^ permalink raw reply	[flat|nested] 4+ messages in thread

* bug#68562: [PATCH 0/2] Fix python-plotnine build
  2024-01-18 10:01 [bug#68562] [PATCH 0/2] Fix python-plotnine build Troy Figiel
  2024-01-18  9:43 ` [bug#68562] [PATCH 1/2] gnu: python-plotnine: Fix build Troy Figiel
  2024-01-18  9:54 ` [bug#68562] [PATCH 2/2] gnu: python-plotnine: Reformat with guix style Troy Figiel
@ 2024-01-18 21:08 ` Sharlatan Hellseher
  2 siblings, 0 replies; 4+ messages in thread
From: Sharlatan Hellseher @ 2024-01-18 21:08 UTC (permalink / raw)
  To: 68562-done

[-- Attachment #1: Type: text/plain, Size: 67 bytes --]


Pushed as  0118fe6f85cd4ecef26c82847cb2723efb5de985.

Thans,
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-01-18 21:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-18 10:01 [bug#68562] [PATCH 0/2] Fix python-plotnine build Troy Figiel
2024-01-18  9:43 ` [bug#68562] [PATCH 1/2] gnu: python-plotnine: Fix build Troy Figiel
2024-01-18  9:54 ` [bug#68562] [PATCH 2/2] gnu: python-plotnine: Reformat with guix style Troy Figiel
2024-01-18 21:08 ` bug#68562: [PATCH 0/2] Fix python-plotnine build Sharlatan Hellseher

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.