From 335dd395e3ae77cf1afa1b65eea856781f3c61e5 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 9 Jun 2024 23:08:46 -0700 Subject: [PATCH 1/4] build/pkgs/cypari: Update to 2.2.0rc1 --- build/pkgs/cypari/checksums.ini | 4 ++-- build/pkgs/cypari/package-version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/cypari/checksums.ini b/build/pkgs/cypari/checksums.ini index 8bedd4cf52d..e2411bb3a1b 100644 --- a/build/pkgs/cypari/checksums.ini +++ b/build/pkgs/cypari/checksums.ini @@ -1,4 +1,4 @@ tarball=cypari2-VERSION.tar.gz -sha1=4cb5fc43899852b7fc0c0175e610318c38f0caac -sha256=1a25865c34f20b1dc95830798e34ab6436e278b8e0c80dc7bf0ab34c5db03ab8 +sha1=d6f2fd9d8e6b2aeddadb506fae2832aff6309a1a +sha256=324f084facec75ab94a1e656fa48d5e679103ba1359ccb1256e25021dfbf24b7 upstream_url=https://pypi.io/packages/source/c/cypari2/cypari2-VERSION.tar.gz diff --git a/build/pkgs/cypari/package-version.txt b/build/pkgs/cypari/package-version.txt index cd57a8b95d6..bdc2ab641dc 100644 --- a/build/pkgs/cypari/package-version.txt +++ b/build/pkgs/cypari/package-version.txt @@ -1 +1 @@ -2.1.5 +2.2.0rc1 From 83e6ad1f5657be4037f3ca332b99c27eca6999f7 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 9 Jun 2024 23:10:05 -0700 Subject: [PATCH 2/4] build/pkgs/cypari/dependencies: Update --- build/pkgs/cypari/dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/cypari/dependencies b/build/pkgs/cypari/dependencies index 69dfe7e7d8a..cbf047c8027 100644 --- a/build/pkgs/cypari/dependencies +++ b/build/pkgs/cypari/dependencies @@ -1,4 +1,4 @@ - cython pari cysignals | $(PYTHON_TOOLCHAIN) $(PYTHON) +pari cysignals | $(PYTHON_TOOLCHAIN) cython $(PYTHON) ---------- All lines of this file are ignored except the first. From abb50ec0ef7ffbdaeeea4fc3d6dda57570f9b245 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 10 Jun 2024 00:24:29 -0700 Subject: [PATCH 3/4] build/pkgs/cypari/patches/trashcan.patch: Remove (upstreamed) --- build/pkgs/cypari/patches/trashcan.patch | 47 ------------------------ 1 file changed, 47 deletions(-) delete mode 100644 build/pkgs/cypari/patches/trashcan.patch diff --git a/build/pkgs/cypari/patches/trashcan.patch b/build/pkgs/cypari/patches/trashcan.patch deleted file mode 100644 index f4918d4cd39..00000000000 --- a/build/pkgs/cypari/patches/trashcan.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit 78e6dcf937c960c51132132e14f86bddbbe5b7d9 -Author: Jeroen Demeyer -Date: Tue Feb 19 11:50:49 2019 +0100 - - Use the trashcan for Gen - -diff --git a/cypari2/gen.pxd b/cypari2/gen.pxd -index 2ac0669..664d57d 100644 ---- a/cypari2/gen.pxd -+++ b/cypari2/gen.pxd -@@ -1,3 +1,4 @@ -+cimport cython - from cpython.object cimport PyObject - from .types cimport GEN, pari_sp - -diff --git a/cypari2/gen.pyx b/cypari2/gen.pyx -index d268cf1..687f5b2 100644 ---- a/cypari2/gen.pyx -+++ b/cypari2/gen.pyx -@@ -135,6 +135,7 @@ cdef extern from *: - GEN new_nfeltup(GEN nf, GEN x, GEN zknf) - - -+@cython.trashcan(True) - cdef class Gen(Gen_base): - """ - Wrapper for a PARI ``GEN`` with memory management. -diff --git a/cypari2/pari_instance.pyx b/cypari2/pari_instance.pyx -index ba82438..d13bc45 100644 ---- a/cypari2/pari_instance.pyx -+++ b/cypari2/pari_instance.pyx -@@ -243,6 +243,15 @@ Reset default precision for the following tests: - - >>> pari.set_real_precision_bits(53) - -+Test the trashcan mechanism (without the trashcan, this would cause -+a stack overflow): -+ -+>>> pari.allocatemem(2**27, silent=True) -+>>> L = [pari(i) for i in range(2**20)] -+>>> x = pari.Pi() -+>>> del L -+>>> del x -+ - Test that interrupts work properly: - - >>> pari.allocatemem(8000000, 2**29) From 559408a924ef850a59af3a80e966351f4c287a43 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Tue, 13 Aug 2024 12:07:16 -0700 Subject: [PATCH 4/4] build/pkgs/cypari: Update to 2.2.0 --- build/pkgs/cypari/checksums.ini | 4 ++-- build/pkgs/cypari/package-version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/cypari/checksums.ini b/build/pkgs/cypari/checksums.ini index e2411bb3a1b..d183b3c567a 100644 --- a/build/pkgs/cypari/checksums.ini +++ b/build/pkgs/cypari/checksums.ini @@ -1,4 +1,4 @@ tarball=cypari2-VERSION.tar.gz -sha1=d6f2fd9d8e6b2aeddadb506fae2832aff6309a1a -sha256=324f084facec75ab94a1e656fa48d5e679103ba1359ccb1256e25021dfbf24b7 +sha1=4e9f14d218bc1cea29e03a2ceec9bf3dfbfd5eb3 +sha256=817606bf661b71d33e1d012421907a4f8fb09dd81b7d3e3ae179b3978020bbf1 upstream_url=https://pypi.io/packages/source/c/cypari2/cypari2-VERSION.tar.gz diff --git a/build/pkgs/cypari/package-version.txt b/build/pkgs/cypari/package-version.txt index bdc2ab641dc..ccbccc3dc62 100644 --- a/build/pkgs/cypari/package-version.txt +++ b/build/pkgs/cypari/package-version.txt @@ -1 +1 @@ -2.2.0rc1 +2.2.0