unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#55084] [PATCH] gnu: python-numpy-next: Update to 1.22.3.
@ 2022-04-23 16:48 Felix Gruber
  2022-04-26  9:22 ` Mathieu Othacehe
  2022-05-09 10:26 ` bug#55084: " Ludovic Courtès
  0 siblings, 2 replies; 4+ messages in thread
From: Felix Gruber @ 2022-04-23 16:48 UTC (permalink / raw)
  To: 55084; +Cc: Felix Gruber

* gnu/packages/python-xyz.scm (python-numpy-next): Update to 1.22.3.
[native-inputs]: Replace python-hypothesis with python-hypothesis-6.23.
* gnu/packages/python-xyz.scm (python-numpy-1.20)[native-inputs]:
Explicitly set native-inputs to prevent it to inherit the modified
native-inputs from python-numpy-next, which would result in > 2000
package rebuilds.
---
 gnu/packages/python-xyz.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 9a5d311680..3f984c03e2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5667,7 +5667,7 @@ writing C extensions for Python as easy as Python itself.")
 (define-public python-numpy-next
   (package
     (name "python-numpy-next")
-    (version "1.21.3")
+    (version "1.22.3")
     (source
      (origin
        (method url-fetch)
@@ -5676,12 +5676,12 @@ writing C extensions for Python as easy as Python itself.")
              version "/numpy-" version ".tar.gz"))
        (sha256
         (base32
-         "0s6hy8828yr7fcjiwnym4l8lrknr21gqfkaiawsf86n0hd0a5fyh"))))
+         "19dw91pqbqcniw2z57kiyqs1qp56g7kqy1bdyv664g8s62sc01m9"))))
     (build-system python-build-system)
     (inputs
      (list openblas))
     (native-inputs
-     (list python-cython python-hypothesis python-pytest
+     (list python-cython python-hypothesis-6.23 python-pytest
            python-pytest-xdist gfortran))
     (arguments
      `(#:phases
@@ -5773,6 +5773,12 @@ capabilities.")
               (sha256
                (base32
                 "140zq9snx0di4id4g97vaw9zz8x2rfla5lp3a70j666f5030yd5p"))))
+    ;; python-numpy-next replaced python-hypothesis with
+    ;; python-hypothesis-6.23. We switch it back here, to prevent
+    ;; python-numpy-1.20 and its numerous dependents from being rebuilt.
+    (native-inputs
+     (list python-cython python-hypothesis python-pytest
+           python-pytest-xdist gfortran))
     ;; 92 tests fail, many of them because parts of the temp file name
     ;; accidentally ends up in a comparison.
     (arguments
-- 
2.30.2





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

* [bug#55084] [PATCH] gnu: python-numpy-next: Update to 1.22.3.
  2022-04-23 16:48 [bug#55084] [PATCH] gnu: python-numpy-next: Update to 1.22.3 Felix Gruber
@ 2022-04-26  9:22 ` Mathieu Othacehe
  2022-04-26 10:59   ` zimoun
  2022-05-09 10:26 ` bug#55084: " Ludovic Courtès
  1 sibling, 1 reply; 4+ messages in thread
From: Mathieu Othacehe @ 2022-04-26  9:22 UTC (permalink / raw)
  To: Felix Gruber; +Cc: 55084


Hello Felix,

> +    (native-inputs
> +     (list python-cython python-hypothesis python-pytest
> +           python-pytest-xdist gfortran))

What about using something like:

--8<---------------cut here---------------start------------->8---
    (native-inputs
     (modify-inputs (package-inputs python-numpy-next)
       (delete "python-hypothesis")
       (prepend python-hypothesis)))
--8<---------------cut here---------------end--------------->8---

not to duplicate the native-inputs list?

Thanks,

Mathieu




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

* [bug#55084] [PATCH] gnu: python-numpy-next: Update to 1.22.3.
  2022-04-26  9:22 ` Mathieu Othacehe
@ 2022-04-26 10:59   ` zimoun
  0 siblings, 0 replies; 4+ messages in thread
From: zimoun @ 2022-04-26 10:59 UTC (permalink / raw)
  To: Mathieu Othacehe; +Cc: Felix Gruber, 55084

Hi Mathieu,

On Tue, 26 Apr 2022 at 11:23, Mathieu Othacehe <othacehe@gnu.org> wrote:

> > +    (native-inputs
> > +     (list python-cython python-hypothesis python-pytest
> > +           python-pytest-xdist gfortran))
>
> What about using something like:
>
> --8<---------------cut here---------------start------------->8---
>     (native-inputs
>      (modify-inputs (package-inputs python-numpy-next)
>        (delete "python-hypothesis")
>        (prepend python-hypothesis)))
> --8<---------------cut here---------------end--------------->8---
>
> not to duplicate the native-inputs list?

I do not think it is possible because, whereas this 'modify-inputs' is
better for readibility, it implies a rebuild of the package, IMHO; the
very thing we would like to avoid since touching to python-numpy is a
core-update modification.

However, maybe python-numpy-next could inherit from python-numpy
instead of the contrary.  Well, I do not know if it is better...


Cheers,
simon




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

* bug#55084: [PATCH] gnu: python-numpy-next: Update to 1.22.3.
  2022-04-23 16:48 [bug#55084] [PATCH] gnu: python-numpy-next: Update to 1.22.3 Felix Gruber
  2022-04-26  9:22 ` Mathieu Othacehe
@ 2022-05-09 10:26 ` Ludovic Courtès
  1 sibling, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2022-05-09 10:26 UTC (permalink / raw)
  To: Felix Gruber; +Cc: 55084-done

Hi,

Felix Gruber <felgru@posteo.net> skribis:

> * gnu/packages/python-xyz.scm (python-numpy-next): Update to 1.22.3.
> [native-inputs]: Replace python-hypothesis with python-hypothesis-6.23.
> * gnu/packages/python-xyz.scm (python-numpy-1.20)[native-inputs]:
> Explicitly set native-inputs to prevent it to inherit the modified
> native-inputs from python-numpy-next, which would result in > 2000
> package rebuilds.

Applied, thanks!

Ludo’.




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

end of thread, other threads:[~2022-05-09 10:28 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-23 16:48 [bug#55084] [PATCH] gnu: python-numpy-next: Update to 1.22.3 Felix Gruber
2022-04-26  9:22 ` Mathieu Othacehe
2022-04-26 10:59   ` zimoun
2022-05-09 10:26 ` bug#55084: " Ludovic Courtès

Code repositories for project(s) associated with this public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).