From 1a9d6854a4093241b62f4d6bdae31d167b548971 Mon Sep 17 00:00:00 2001 From: icp 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 " 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