* [PR PATCH] python3-cypari2: sync version with upstream release tag
@ 2022-11-14 13:21 icp1994
2022-11-16 20:11 ` tornaria
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: icp1994 @ 2022-11-14 13:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 782 bytes --]
There is a new pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages python3-cypari2
https://github.com/void-linux/void-packages/pull/40529
python3-cypari2: sync version with upstream release tag
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
@tornaria upstream released a tagged v2.1.3 tarball including changes in the patch. I added `python3-cysignals` under depends since it's mentioned under their [install_requires]( https://github.com/sagemath/cypari2/blob/2.1.3/setup.py#L70). Does this look okay to you?
A patch file from https://github.com/void-linux/void-packages/pull/40529.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-cypari2-40529.patch --]
[-- Type: text/x-diff, Size: 4205 bytes --]
From 1a9d6854a4093241b62f4d6bdae31d167b548971 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 14 Nov 2022 18:42:43 +0530
Subject: [PATCH] python3-cypari2: sync version with upstream release tag
---
.../python3-cypari2/patches/pari-2.15.patch | 47 -------------------
srcpkgs/python3-cypari2/template | 9 ++--
2 files changed, 4 insertions(+), 52 deletions(-)
delete mode 100644 srcpkgs/python3-cypari2/patches/pari-2.15.patch
diff --git a/srcpkgs/python3-cypari2/patches/pari-2.15.patch b/srcpkgs/python3-cypari2/patches/pari-2.15.patch
deleted file mode 100644
index d7fef450b4ce..000000000000
--- a/srcpkgs/python3-cypari2/patches/pari-2.15.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-See:
- - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1020456#10
- - https://github.com/sagemath/cypari2/issues/122
- - https://github.com/sagemath/cypari2/pull/123
-
-diff --git a/cypari2/closure.pyx b/cypari2/closure.pyx
-index 9848b51..ca87403 100644
---- a/cypari2/closure.pyx
-+++ b/cypari2/closure.pyx
-@@ -208,7 +208,7 @@ cpdef Gen objtoclosure(f):
- >>> mul([1], [2])
- Traceback (most recent call last):
- ...
-- PariError: call_python: forbidden multiplication t_VEC (1 elts) * t_VEC (1 elts)
-+ PariError: call_python: incorrect type in qfbcomp (t_VEC)
- """
- if not callable(f):
- raise TypeError("argument to objtoclosure() must be callable")
-diff --git a/cypari2/handle_error.pyx b/cypari2/handle_error.pyx
-index 1222889..ba93ad1 100644
---- a/cypari2/handle_error.pyx
-+++ b/cypari2/handle_error.pyx
-@@ -123,7 +123,7 @@ class PariError(RuntimeError):
- >>> pari('!@#$%^&*()')
- Traceback (most recent call last):
- ...
-- PariError: syntax error, unexpected $undefined
-+ PariError: syntax error, unexpected invalid token
- """
- return self.errtext().rstrip(" .:")
-
-diff --git a/cypari2/pari_instance.pyx b/cypari2/pari_instance.pyx
-index 4291188..172fce5 100644
---- a/cypari2/pari_instance.pyx
-+++ b/cypari2/pari_instance.pyx
-@@ -1325,9 +1325,9 @@ cdef class Pari(Pari_auto):
- >>> pari = cypari2.Pari()
- >>> x = pari('x')
- >>> pari.genus2red([-5*x**5, x**3 - 2*x**2 - 2*x + 1])
-- [1416875, [2, -1; 5, 4; 2267, 1], x^6 - 240*x^4 - 2550*x^3 - 11400*x^2 - 24100*x - 19855, [[2, [2, [Mod(1, 2)]], []], [5, [1, []], ["[V] page 156", [3]]], [2267, [2, [Mod(432, 2267)]], ["[I{1-0-0}] page 170", []]]]]
-+ [1416875, [2, -1; 5, 4; 2267, 1], [-6*x^5 + 2*x^3 - x, x^3 + 1], [[2, [2, [Mod(1, 2)]], []], [5, [1, []], ["[V] page 156", [3]]], [2267, [2, [Mod(432, 2267)]], ["[I{1-0-0}] page 170", []]]]]
- >>> pari.genus2red([-5*x**5, x**3 - 2*x**2 - 2*x + 1],2267)
-- [2267, Mat([2267, 1]), x^6 - 24*x^5 + 10*x^3 - 4*x + 1, [2267, [2, [Mod(432, 2267)]], ["[I{1-0-0}] page 170", []]]]
-+ [2267, Mat([2267, 1]), [-6*x^5 + 2*x^3 - x, x^3 + 1], [2267, [2, [Mod(432, 2267)]], ["[I{1-0-0}] page 170", []]]]
- """
- cdef Gen t0 = objtogen(P)
- if p is None:
diff --git a/srcpkgs/python3-cypari2/template b/srcpkgs/python3-cypari2/template
index 04b8ab041f9a..9516e15acdd8 100644
--- a/srcpkgs/python3-cypari2/template
+++ b/srcpkgs/python3-cypari2/template
@@ -1,15 +1,14 @@
# Template file for 'python3-cypari2'
pkgname=python3-cypari2
version=2.1.3
-revision=2
-# This is precisely release 2.1.3 (Oct 3); but it's not tagged yet
-_githash=34198a78e86ba6ba684b25ae5ebb3e1a4e54c19f
+revision=3
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython pari perl"
makedepends="python3-devel python3-cysignals pari-devel gmp-devel"
+depends="python3-cysignals"
short_desc="Python interface to the number theory library PARI/GP"
maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="GPL-2.0-or-later"
homepage="https://github.com/sagemath/cypari2"
-distfiles=https://github.com/sagemath/cypari2/archive/$_githash.tar.gz
-checksum=16bcc5da48a05e3d56a1466e9ed0c2ec91d48fe875bf1adda237bb7690d3f7c3
+distfiles="https://github.com/sagemath/cypari2/archive/refs/tags/${version}.tar.gz"
+checksum=6f6f6ca2b2c2dbef4444727e8fb8652b090cfac4297ba959e94b3a91bbd86548
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: python3-cypari2: sync version with upstream release tag
2022-11-14 13:21 [PR PATCH] python3-cypari2: sync version with upstream release tag icp1994
@ 2022-11-16 20:11 ` tornaria
2022-11-16 20:24 ` tornaria
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: tornaria @ 2022-11-16 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/40529#issuecomment-1317607554
Comment:
Lgtm, however tests are not running. I'm pretty sure they were running before since I fixed them. What happened?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: python3-cypari2: sync version with upstream release tag
2022-11-14 13:21 [PR PATCH] python3-cypari2: sync version with upstream release tag icp1994
2022-11-16 20:11 ` tornaria
@ 2022-11-16 20:24 ` tornaria
2022-11-17 11:23 ` paper42
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: tornaria @ 2022-11-16 20:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/40529#issuecomment-1317622464
Comment:
I see they were removed in a23094e715ffc8a292c1e98391f47981218e00ee, could you add that back?
@sgn any particular reason you removed the tests? Unfortunately they won't run using setuptools, only with `make check` with `PYTHONPATH` properly set.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: python3-cypari2: sync version with upstream release tag
2022-11-14 13:21 [PR PATCH] python3-cypari2: sync version with upstream release tag icp1994
2022-11-16 20:11 ` tornaria
2022-11-16 20:24 ` tornaria
@ 2022-11-17 11:23 ` paper42
2022-11-17 14:11 ` [PR PATCH] [Updated] " icp1994
2022-11-18 6:26 ` [PR PATCH] [Merged]: " classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: paper42 @ 2022-11-17 11:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 374 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40529#issuecomment-1318489098
Comment:
> @sgn any particular reason you removed the tests? Unfortunately they won't run using setuptools, only with `make check` with `PYTHONPATH` properly set.
as discussed on IRC, removing tests was a mistake, could you add them back?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] python3-cypari2: sync version with upstream release tag
2022-11-14 13:21 [PR PATCH] python3-cypari2: sync version with upstream release tag icp1994
` (2 preceding siblings ...)
2022-11-17 11:23 ` paper42
@ 2022-11-17 14:11 ` icp1994
2022-11-18 6:26 ` [PR PATCH] [Merged]: " classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: icp1994 @ 2022-11-17 14:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
There is an updated pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages python3-cypari2
https://github.com/void-linux/void-packages/pull/40529
python3-cypari2: sync version with upstream release tag
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
@tornaria upstream released a tagged v2.1.3 tarball including changes in the patch. I added `python3-cysignals` under depends since it's mentioned under their [install_requires]( https://github.com/sagemath/cypari2/blob/2.1.3/setup.py#L70). Does this look okay to you?
A patch file from https://github.com/void-linux/void-packages/pull/40529.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python3-cypari2-40529.patch --]
[-- Type: text/x-diff, Size: 4312 bytes --]
From 129615652d141a5006840e80e720cbeba02c9e0a Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 14 Nov 2022 18:42:43 +0530
Subject: [PATCH] python3-cypari2: sync version with upstream release tag
---
.../python3-cypari2/patches/pari-2.15.patch | 47 -------------------
srcpkgs/python3-cypari2/template | 14 ++++--
2 files changed, 9 insertions(+), 52 deletions(-)
delete mode 100644 srcpkgs/python3-cypari2/patches/pari-2.15.patch
diff --git a/srcpkgs/python3-cypari2/patches/pari-2.15.patch b/srcpkgs/python3-cypari2/patches/pari-2.15.patch
deleted file mode 100644
index d7fef450b4ce..000000000000
--- a/srcpkgs/python3-cypari2/patches/pari-2.15.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-See:
- - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1020456#10
- - https://github.com/sagemath/cypari2/issues/122
- - https://github.com/sagemath/cypari2/pull/123
-
-diff --git a/cypari2/closure.pyx b/cypari2/closure.pyx
-index 9848b51..ca87403 100644
---- a/cypari2/closure.pyx
-+++ b/cypari2/closure.pyx
-@@ -208,7 +208,7 @@ cpdef Gen objtoclosure(f):
- >>> mul([1], [2])
- Traceback (most recent call last):
- ...
-- PariError: call_python: forbidden multiplication t_VEC (1 elts) * t_VEC (1 elts)
-+ PariError: call_python: incorrect type in qfbcomp (t_VEC)
- """
- if not callable(f):
- raise TypeError("argument to objtoclosure() must be callable")
-diff --git a/cypari2/handle_error.pyx b/cypari2/handle_error.pyx
-index 1222889..ba93ad1 100644
---- a/cypari2/handle_error.pyx
-+++ b/cypari2/handle_error.pyx
-@@ -123,7 +123,7 @@ class PariError(RuntimeError):
- >>> pari('!@#$%^&*()')
- Traceback (most recent call last):
- ...
-- PariError: syntax error, unexpected $undefined
-+ PariError: syntax error, unexpected invalid token
- """
- return self.errtext().rstrip(" .:")
-
-diff --git a/cypari2/pari_instance.pyx b/cypari2/pari_instance.pyx
-index 4291188..172fce5 100644
---- a/cypari2/pari_instance.pyx
-+++ b/cypari2/pari_instance.pyx
-@@ -1325,9 +1325,9 @@ cdef class Pari(Pari_auto):
- >>> pari = cypari2.Pari()
- >>> x = pari('x')
- >>> pari.genus2red([-5*x**5, x**3 - 2*x**2 - 2*x + 1])
-- [1416875, [2, -1; 5, 4; 2267, 1], x^6 - 240*x^4 - 2550*x^3 - 11400*x^2 - 24100*x - 19855, [[2, [2, [Mod(1, 2)]], []], [5, [1, []], ["[V] page 156", [3]]], [2267, [2, [Mod(432, 2267)]], ["[I{1-0-0}] page 170", []]]]]
-+ [1416875, [2, -1; 5, 4; 2267, 1], [-6*x^5 + 2*x^3 - x, x^3 + 1], [[2, [2, [Mod(1, 2)]], []], [5, [1, []], ["[V] page 156", [3]]], [2267, [2, [Mod(432, 2267)]], ["[I{1-0-0}] page 170", []]]]]
- >>> pari.genus2red([-5*x**5, x**3 - 2*x**2 - 2*x + 1],2267)
-- [2267, Mat([2267, 1]), x^6 - 24*x^5 + 10*x^3 - 4*x + 1, [2267, [2, [Mod(432, 2267)]], ["[I{1-0-0}] page 170", []]]]
-+ [2267, Mat([2267, 1]), [-6*x^5 + 2*x^3 - x, x^3 + 1], [2267, [2, [Mod(432, 2267)]], ["[I{1-0-0}] page 170", []]]]
- """
- cdef Gen t0 = objtogen(P)
- if p is None:
diff --git a/srcpkgs/python3-cypari2/template b/srcpkgs/python3-cypari2/template
index 04b8ab041f9a..a8ef86740ec4 100644
--- a/srcpkgs/python3-cypari2/template
+++ b/srcpkgs/python3-cypari2/template
@@ -1,15 +1,19 @@
# Template file for 'python3-cypari2'
pkgname=python3-cypari2
version=2.1.3
-revision=2
-# This is precisely release 2.1.3 (Oct 3); but it's not tagged yet
-_githash=34198a78e86ba6ba684b25ae5ebb3e1a4e54c19f
+revision=3
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython pari perl"
makedepends="python3-devel python3-cysignals pari-devel gmp-devel"
+depends="python3-cysignals"
+checkdepends="${depends} python3-pytest"
short_desc="Python interface to the number theory library PARI/GP"
maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="GPL-2.0-or-later"
homepage="https://github.com/sagemath/cypari2"
-distfiles=https://github.com/sagemath/cypari2/archive/$_githash.tar.gz
-checksum=16bcc5da48a05e3d56a1466e9ed0c2ec91d48fe875bf1adda237bb7690d3f7c3
+distfiles="https://github.com/sagemath/cypari2/archive/refs/tags/${version}.tar.gz"
+checksum=6f6f6ca2b2c2dbef4444727e8fb8652b090cfac4297ba959e94b3a91bbd86548
+
+do_check() {
+ PYTHONPATH=$(cd build/lib* && pwd) pytest
+}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: python3-cypari2: sync version with upstream release tag
2022-11-14 13:21 [PR PATCH] python3-cypari2: sync version with upstream release tag icp1994
` (3 preceding siblings ...)
2022-11-17 14:11 ` [PR PATCH] [Updated] " icp1994
@ 2022-11-18 6:26 ` classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: classabbyamp @ 2022-11-18 6:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 623 bytes --]
There's a merged pull request on the void-packages repository
python3-cypari2: sync version with upstream release tag
https://github.com/void-linux/void-packages/pull/40529
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x86_64
@tornaria upstream released a tagged v2.1.3 tarball including changes in the patch. I added `python3-cysignals` under depends since it's mentioned under their [install_requires]( https://github.com/sagemath/cypari2/blob/2.1.3/setup.py#L70). Does this look okay to you?
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-11-18 6:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-14 13:21 [PR PATCH] python3-cypari2: sync version with upstream release tag icp1994
2022-11-16 20:11 ` tornaria
2022-11-16 20:24 ` tornaria
2022-11-17 11:23 ` paper42
2022-11-17 14:11 ` [PR PATCH] [Updated] " icp1994
2022-11-18 6:26 ` [PR PATCH] [Merged]: " classabbyamp
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 NNTP newsgroup(s).