Skip to content

Commit

Permalink
sagemathgh-38749: Upgrade to pari 2.17.1, cypari 2.2.1, cysignals 1.12.3
Browse files Browse the repository at this point in the history
    
`NEXT_PRIME_VIADIFF` is removed in 2.17, port `pari_prime_range` to
`pari_PRIMES` instead

Needs sagemath/cypari2#165 applied to cypari
    
URL: sagemath#38749
Reported by: Antonio Rojas
Reviewer(s): Antonio Rojas, Dima Pasechnik, Gonzalo Tornaría
  • Loading branch information
Release Manager committed Jan 30, 2025
2 parents dc99dc8 + ee32f10 commit 35497a8
Show file tree
Hide file tree
Showing 73 changed files with 943 additions and 965 deletions.
4 changes: 2 additions & 2 deletions build/pkgs/cypari/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=cypari2-VERSION.tar.gz
sha1=4e9f14d218bc1cea29e03a2ceec9bf3dfbfd5eb3
sha256=817606bf661b71d33e1d012421907a4f8fb09dd81b7d3e3ae179b3978020bbf1
sha1=556d1a16818663ba6e6a3c9d2b14cc907a7eef4c
sha256=aaa017a6a280581902f73cf5ce1695712b6598a032be14cfab81f97c475f83b8
upstream_url=https://files.pythonhosted.org/packages/source/c/cypari2/cypari2-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/cypari/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.0
2.2.1
4 changes: 2 additions & 2 deletions build/pkgs/cysignals/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=cysignals-VERSION.tar.gz
sha1=76db7aa59d55e867c83b329c017382555253af43
sha256=0f1e321e55a07f901c86a36a1e4497f6ff9dfe700681d0130a38c36e4eb238c3
sha1=e285e209a3a5f9469cb5ade746c518cd3a600a9b
sha256=89f7626dbf29db5ab3d6eff15a89978f4eb5193c320e9099bcc157dacdefd1eb
upstream_url=https://files.pythonhosted.org/packages/source/c/cysignals/cysignals-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/cysignals/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cython pari | $(PYTHON_TOOLCHAIN) $(PYTHON)
cython | $(PYTHON_TOOLCHAIN) meson_python $(PYTHON)

----------
All lines of this file are ignored except the first.
2 changes: 1 addition & 1 deletion build/pkgs/cysignals/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.4
1.12.3
5 changes: 0 additions & 5 deletions build/pkgs/cysignals/spkg-install.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,4 @@ cd src
# #29473: Override -Wp,-D_FORTIFY_SOURCE from Fedora's python3.
export CPPFLAGS="$CPPFLAGS -Wp,-U_FORTIFY_SOURCE"

if [ "$SAGE_DEBUG" = yes ]; then
CYSIGNALS_CONFIGURE="--enable-debug $CYSIGNALS_CONFIGURE"
fi

sdh_configure $CYSIGNALS_CONFIGURE
sdh_pip_install .
6 changes: 3 additions & 3 deletions build/pkgs/pari/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=pari-VERSION.tar.gz
sha1=377593dfe72df13578ea0a517fcb0f81cc9758d4
sha256=0efdda7515d9d954f63324c34b34c560e60f73a81c3924a71260a2cc91d5f981
upstream_url=https://pari.math.u-bordeaux.fr/pub/pari/OLD/${VERSION_MAJOR}.${VERSION_MINOR}/pari-VERSION.tar.gz
sha1=f5f5656a68947ef6a4841d40dd09a72fe96762a5
sha256=67ba6f3071233725258541e4f174b5efbc64c65ae5115bade9edfc45f1fde5dc
upstream_url=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/pari/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.15.5
2.17.1
5 changes: 2 additions & 3 deletions build/pkgs/pari/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
SAGE_SPKG_CONFIGURE([pari], [
dnl See gp_version below on how the version is computed from MAJV.MINV.PATCHV
m4_pushdef([SAGE_PARI_MINVER],["134916"])dnl this version and higher allowed
dnl Do not allow Pari 2.17 or later, see #38769:
m4_pushdef([SAGE_PARI_MAXVER],["135424"])dnl this version and higher not allowed
m4_pushdef([SAGE_PARI_MINVER],["135245"])dnl this version and higher allowed
m4_pushdef([SAGE_PARI_MAXVER],["999999"])dnl this version and higher not allowed
SAGE_SPKG_DEPCHECK([gmp readline], [
AC_PATH_PROG([GP], [gp])
if test x$GP = x; then dnl GP test
Expand Down
128 changes: 64 additions & 64 deletions environment-3.11-linux-aarch64.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
name: sage-dev
# Generated by conda-lock.
# platform: linux-aarch64
# input_hash: 09e3b72a7aa5c065370cb8a339e14ed42ad43f0c89abc55b38713be2d4560fd9
# input_hash: 8682c27c6bd8b3e849271dd9881b907b660025227d849b37e5c7098a5a6a84ab

channels:
- conda-forge
dependencies:
- _openmp_mutex=4.5=2_kmp_llvm
- alabaster=1.0.0=pyhd8ed1ab_1
- alsa-lib=1.2.13=h86ecc28_0
- arpack=3.9.1=nompi_hd363cd0_101
- arpack=3.9.1=nompi_h6fc4d3a_102
- asttokens=3.0.0=pyhd8ed1ab_1
- autoconf=2.71=pl5321h2148fe1_1
- automake=1.17=pl5321h8af1aa0_0
- babel=2.16.0=pyhd8ed1ab_1
- bdw-gc=8.0.6=hd62202e_0
- bdw-gc=8.2.8=h5ad3122_1
- beautifulsoup4=4.12.3=pyha770c72_1
- binutils=2.43=hf1166c9_2
- binutils_impl_linux-aarch64=2.43=h4c662bb_2
Expand All @@ -28,33 +28,33 @@ dependencies:
- brotli-python=1.1.0=py311h89d996e_2
- bzip2=1.0.8=h68df207_7
- c-ares=1.34.4=h86ecc28_0
- c-compiler=1.8.0=h6561dab_1
- c-compiler=1.9.0=h6561dab_0
- ca-certificates=2024.12.14=hcefe29a_0
- cairo=1.18.2=h83712da_1
- cddlib=1!0.94m=h719063d_0
- certifi=2024.12.14=pyhd8ed1ab_0
- cffi=1.17.1=py311h14e8bb7_0
- charset-normalizer=3.4.0=pyhd8ed1ab_1
- charset-normalizer=3.4.1=pyhd8ed1ab_0
- cliquer=1.22=h31becfc_1
- colorama=0.4.6=pyhd8ed1ab_1
- comm=0.2.2=pyhd8ed1ab_1
- contourpy=1.3.1=py311hc07b1fb_0
- conway-polynomials=0.10=pyhd8ed1ab_0
- coverage=7.6.9=py311ha09ea12_0
- coverage=7.6.10=py311ha09ea12_0
- cpython=3.11.11=py311hd8ed1ab_1
- cxx-compiler=1.8.0=heb6c788_1
- cxx-compiler=1.9.0=heb6c788_0
- cycler=0.12.1=pyhd8ed1ab_1
- cypari2=2.1.5=py311h5ab95f0_0
- cypari2=2.2.1=py311hc8fbf20_0
- cyrus-sasl=2.1.27=hf6b2984_7
- cysignals=1.11.2=py311h644d908_3
- cysignals=1.12.3=py311h89d996e_0
- cython=3.0.11=py311hac78f04_3
- dbus=1.13.6=h12b9eeb_3
- debugpy=1.8.11=py311h89d996e_0
- debugpy=1.8.12=py311h89d996e_0
- decorator=5.1.1=pyhd8ed1ab_1
- docutils=0.21.2=pyhd8ed1ab_1
- double-conversion=3.3.0=h2f0025b_0
- ecl=24.5.10=h5567cc5_0
- eclib=20231212=h154513d_1
- eclib=20231212=h4705ef2_2
- ecm=7.0.5=ha2d0fc4_0
- exceptiongroup=1.2.2=pyhd8ed1ab_1
- execnet=2.1.1=pyhd8ed1ab_1
Expand All @@ -68,14 +68,14 @@ dependencies:
- fontconfig=2.15.0=h8dda3cd_1
- fonts-conda-ecosystem=1=0
- fonts-conda-forge=1=0
- fonttools=4.55.3=py311h58d527c_0
- fortran-compiler=1.8.0=h25a59a9_1
- fplll=5.4.5=hb3a790e_0
- fpylll=0.6.1=py311h5d3d69a_0
- fonttools=4.55.6=py311h58d527c_0
- fortran-compiler=1.9.0=h25a59a9_0
- fplll=5.5.0=h45c7457_0
- fpylll=0.6.2=py311h2dc1a0e_0
- freetype=2.12.1=hf0a5ef3_2
- furo=2024.8.6=pyhd8ed1ab_1
- gap-core=4.14.0=h1754e88_1
- gap-defaults=4.14.0=h8af1aa0_1
- furo=2024.8.6=pyhd8ed1ab_2
- gap-core=4.14.0=h1754e88_2
- gap-defaults=4.14.0=h8af1aa0_2
- gcc=13.3.0=h8a56e6e_1
- gcc_impl_linux-aarch64=13.3.0=hcdea9b6_1
- gcc_linux-aarch64=13.3.0=h1cd514b_7
Expand All @@ -84,7 +84,7 @@ dependencies:
- gfortran=13.3.0=h8a56e6e_1
- gfortran_impl_linux-aarch64=13.3.0=h174a3c4_1
- gfortran_linux-aarch64=13.3.0=h2809cf8_7
- giac=1.9.0.21=h04922a4_1
- giac=1.9.0.21=h6e4ddb9_2
- givaro=4.2.0=h364d21b_0
- glpk=5.0=h66325d0_0
- gmp=6.3.0=h0a1ffab_2
Expand All @@ -95,29 +95,29 @@ dependencies:
- gxx_impl_linux-aarch64=13.3.0=h1211b58_1
- gxx_linux-aarch64=13.3.0=h2864abd_7
- h2=4.1.0=pyhd8ed1ab_1
- harfbuzz=9.0.0=hbf49d6b_1
- hpack=4.0.0=pyhd8ed1ab_1
- hyperframe=6.0.1=pyhd8ed1ab_1
- harfbuzz=10.2.0=h785c1aa_0
- hpack=4.1.0=pyhd8ed1ab_0
- hyperframe=6.1.0=pyhd8ed1ab_0
- icu=75.1=hf9b3779_0
- idna=3.10=pyhd8ed1ab_1
- igraph=0.10.15=h207f3e5_1
- imagesize=1.4.1=pyhd8ed1ab_0
- iml=1.0.5=h15043fe_1004
- importlib-metadata=8.5.0=pyha770c72_1
- importlib-metadata=8.6.1=pyha770c72_0
- iniconfig=2.0.0=pyhd8ed1ab_1
- ipykernel=6.29.5=pyh3099207_0
- ipython=8.30.0=pyh707e725_0
- ipython=8.31.0=pyh707e725_0
- ipywidgets=8.1.5=pyhd8ed1ab_1
- jedi=0.19.2=pyhd8ed1ab_1
- jinja2=3.1.4=pyhd8ed1ab_1
- jinja2=3.1.5=pyhd8ed1ab_0
- jupyter_client=8.6.3=pyhd8ed1ab_1
- jupyter_core=5.7.2=pyh31011fe_1
- jupyterlab_widgets=3.0.13=pyhd8ed1ab_1
- kernel-headers_linux-aarch64=4.18.0=h05a177a_18
- keyutils=1.6.1=h4e544f5_0
- kiwisolver=1.4.7=py311h75754e6_0
- krb5=1.21.3=h50a48e9_0
- lcalc=2.0.5=he588f68_2
- lcalc=2.0.5=h30a6b3d_3
- lcms2=2.16=h922389a_0
- ld_impl_linux-aarch64=2.43=h80caac9_2
- lerc=4.0.0=h4de3ea5_0
Expand All @@ -131,27 +131,27 @@ dependencies:
- libbrotlidec=1.1.0=h86ecc28_2
- libbrotlienc=1.1.0=h86ecc28_2
- libcblas=3.9.0=26_linuxaarch64_openblas
- libclang-cpp19.1=19.1.6=default_he324ac1_0
- libclang13=19.1.6=default_h4390ef5_0
- libclang-cpp19.1=19.1.7=default_he324ac1_0
- libclang13=19.1.7=default_h4390ef5_0
- libcups=2.3.3=h405e4a8_4
- libcurl=8.11.1=h6702fde_0
- libdeflate=1.23=h5e3c512_0
- libdrm=2.4.124=h86ecc28_0
- libedit=3.1.20191231=he28a2e2_2
- libedit=3.1.20240808=pl5321h976ea20_0
- libegl=1.7.0=hd24410f_2
- libev=4.33=h31becfc_2
- libexpat=2.6.4=h5ad3122_0
- libffi=3.4.2=h3557bc0_5
- libflint=3.1.2=h0433c20_101
- libflint=3.1.3.1=hf9b8075_101
- libgcc=14.2.0=he277a41_1
- libgcc-devel_linux-aarch64=13.3.0=h0c07274_101
- libgcc-ng=14.2.0=he9431aa_1
- libgd=2.3.3=h6818b27_10
- libgd=2.3.3=hc8d7b1d_11
- libgfortran=14.2.0=he9431aa_1
- libgfortran-ng=14.2.0=he9431aa_1
- libgfortran5=14.2.0=hb6113d0_1
- libgl=1.7.0=hd24410f_2
- libglib=2.82.2=hc486b8e_0
- libglib=2.82.2=hc486b8e_1
- libglvnd=1.7.0=hd24410f_2
- libglx=1.7.0=hd24410f_2
- libgomp=14.2.0=he277a41_1
Expand All @@ -160,7 +160,7 @@ dependencies:
- libjpeg-turbo=3.0.0=h31becfc_1
- liblapack=3.9.0=26_linuxaarch64_openblas
- liblapacke=3.9.0=26_linuxaarch64_openblas
- libllvm19=19.1.6=h2edbd07_0
- libllvm19=19.1.7=h2edbd07_0
- liblzma=5.6.3=h86ecc28_1
- liblzma-devel=5.6.3=h86ecc28_1
- libnghttp2=1.64.0=hc8609a4_0
Expand All @@ -169,26 +169,26 @@ dependencies:
- libopenblas=0.3.28=pthreads_h9d3fd7e_1
- libopengl=1.7.0=hd24410f_2
- libpciaccess=0.18=h31becfc_0
- libpng=1.6.44=hc4a20ef_0
- libpng=1.6.45=hec79eb8_0
- libpq=17.2=hd56632b_1
- libsanitizer=13.3.0=ha58e236_1
- libsodium=1.0.20=h68df207_0
- libsqlite=3.47.2=h5eb1b54_0
- libsqlite=3.48.0=h5eb1b54_1
- libssh2=1.11.1=ha41c0db_0
- libstdcxx=14.2.0=h3f4de04_1
- libstdcxx-devel_linux-aarch64=13.3.0=h0c07274_101
- libstdcxx-ng=14.2.0=hf1166c9_1
- libtiff=4.7.0=h88f7998_3
- libuuid=2.38.1=hb4cce97_0
- libwebp-base=1.4.0=h31becfc_0
- libwebp-base=1.5.0=h0886dbf_0
- libxcb=1.17.0=h262b8f6_0
- libxcrypt=4.4.36=h31becfc_1
- libxkbcommon=1.7.0=h46f2afe_1
- libxml2=2.13.5=h2e0c361_1
- libxslt=1.1.39=h1cc9640_0
- libzlib=1.3.1=h86ecc28_2
- linbox=1.7.0=hf74d613_1
- llvm-openmp=19.1.6=h013ceaa_0
- llvm-openmp=19.1.7=h013ceaa_0
- lrcalc=2.1=h5ad3122_7
- m4=1.4.18=h516909a_1001
- m4ri=20140914=hedfd65a_1006
Expand All @@ -206,22 +206,22 @@ dependencies:
- mpfr=4.2.1=h2305555_3
- mpmath=1.3.0=pyhd8ed1ab_1
- munkres=1.1.4=pyh9f0ad1d_0
- mysql-common=9.0.1=h3f5c77f_3
- mysql-libs=9.0.1=h11569fd_3
- mysql-common=9.0.1=h3f5c77f_4
- mysql-libs=9.0.1=h11569fd_4
- nauty=2.8.8=h31becfc_1
- ncurses=6.5=hcccb83c_1
- ncurses=6.5=ha32ae93_2
- nest-asyncio=1.6.0=pyhd8ed1ab_1
- networkx=3.4.2=pyh267e887_2
- ninja=1.12.1=h70be974_0
- ntl=11.4.3=h0d7519b_1
- numpy=1.26.4=py311h69ead2a_0
- numpy=2.2.2=py311h6c2b7b4_0
- openblas=0.3.28=pthreads_h3a8cbd8_1
- openjpeg=2.5.3=h3f56577_0
- openldap=2.6.9=h30c48ee_0
- openssl=3.4.0=h86ecc28_0
- openssl=3.4.0=hd08dc88_1
- packaging=24.2=pyhd8ed1ab_2
- palp=2.20=hb9de7d4_0
- pari=2.15.5=h169c2a7_2_pthread
- pari=2.17.1=h45cace7_2_pthread
- pari-elldata=0.0.20161017=0
- pari-galdata=0.0.20180411=0
- pari-seadata=0.0.20090618=0
Expand All @@ -231,7 +231,7 @@ dependencies:
- perl=5.32.1=7_h31becfc_perl5
- pexpect=4.9.0=pyhd8ed1ab_1
- pickleshare=0.7.5=pyhd8ed1ab_1004
- pillow=11.0.0=py311hb2a0dd2_0
- pillow=11.1.0=py311ha4eaa5e_0
- pip=24.3.1=pyh8b19718_2
- pixman=0.44.2=h86a87f0_0
- pkg-config=0.29.2=hce167ba_1009
Expand All @@ -240,18 +240,18 @@ dependencies:
- platformdirs=4.3.6=pyhd8ed1ab_1
- pluggy=1.5.0=pyhd8ed1ab_1
- ppl=1.2=h984aac9_1006
- pplpy=0.8.9=py311ha3770eb_1
- primecount=7.9=hd600fc2_0
- primecountpy=0.1.0=py311h098ece5_4
- primesieve=11.1=h2f0025b_0
- prompt-toolkit=3.0.48=pyha770c72_1
- psutil=6.1.0=py311ha879c10_0
- pplpy=0.8.9=py311h3d7cd5b_2
- primecount=7.14=hfe4b40e_0
- primecountpy=0.1.0=py311hc07b1fb_5
- primesieve=12.4=h0a1ffab_0
- prompt-toolkit=3.0.50=pyha770c72_0
- psutil=6.1.1=py311ha879c10_0
- pthread-stubs=0.4=h86ecc28_1002
- ptyprocess=0.7.0=pyhd8ed1ab_1
- pure_eval=0.2.3=pyhd8ed1ab_1
- pycparser=2.22=pyh29332c3_1
- pygments=2.18.0=pyhd8ed1ab_1
- pyparsing=3.2.0=pyhd8ed1ab_2
- pygments=2.19.1=pyhd8ed1ab_0
- pyparsing=3.2.1=pyhd8ed1ab_0
- pyproject-metadata=0.9.0=pyhd8ed1ab_1
- pyside6=6.8.1=py311habb2604_0
- pysocks=1.7.1=pyha55dd90_7
Expand All @@ -265,43 +265,43 @@ dependencies:
- pyzmq=26.2.0=py311h826da9f_3
- qd=2.3.22=h05efe27_1004
- qhull=2020.2=h70be974_5
- qt6-main=6.8.1=h0d3cc05_0
- qt6-main=6.8.1=ha0a94ed_2
- readline=8.2=h8fc344f_1
- requests=2.32.3=pyhd8ed1ab_1
- rw=0.9=h31becfc_2
- sagemath-db-elliptic-curves=0.8.1=hecc5488_0
- sagemath-db-graphs=20210214=hd8ed1ab_0
- sagemath-db-polytopes=20170220=1
- scipy=1.14.1=py311h5912639_2
- setuptools=75.6.0=pyhff2d567_1
- scipy=1.15.1=py311h13dcf5b_0
- setuptools=75.8.0=pyhff2d567_0
- singular=4.4.0=hee12f27_1
- six=1.17.0=pyhd8ed1ab_0
- snowballstemmer=2.2.0=pyhd8ed1ab_0
- soupsieve=2.5=pyhd8ed1ab_1
- sphinx=8.1.3=pyhd8ed1ab_1
- sphinx-basic-ng=1.0.0b2=pyhd8ed1ab_2
- sphinx-inline-tabs=2023.4.21=pyhd8ed1ab_0
- sphinx-basic-ng=1.0.0b2=pyhd8ed1ab_3
- sphinx-inline-tabs=2023.4.21=pyhd8ed1ab_1
- sphinxcontrib-applehelp=2.0.0=pyhd8ed1ab_1
- sphinxcontrib-devhelp=2.0.0=pyhd8ed1ab_1
- sphinxcontrib-htmlhelp=2.1.0=pyhd8ed1ab_1
- sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1
- sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1
- sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1
- sqlite=3.47.2=h578a6b9_0
- sqlite=3.48.0=h578a6b9_1
- stack_data=0.6.3=pyhd8ed1ab_1
- symmetrica=3.0.1=hd600fc2_0
- sympow=2.023.6=h157afb5_3
- sympy=1.13.3=pyh2585a3b_104
- sysroot_linux-aarch64=2.17=h5b4a56d_18
- sympow=2.023.6=h4d450c3_4
- sympy=1.13.3=pyh2585a3b_105
- sysroot_linux-aarch64=2.17=h68829e0_18
- tachyon=0.99b6=ha0bfc61_1002
- tk=8.6.13=h194ca79_0
- tomli=2.2.1=pyhd8ed1ab_1
- tornado=6.4.2=py311h5487e9b_0
- traitlets=5.14.3=pyhd8ed1ab_1
- typing_extensions=4.12.2=pyha770c72_1
- tzdata=2024b=hc8b5060_0
- unicodedata2=15.1.0=py311ha879c10_1
- urllib3=2.2.3=pyhd8ed1ab_1
- tzdata=2025a=h78e105d_0
- unicodedata2=16.0.0=py311ha879c10_0
- urllib3=2.3.0=pyhd8ed1ab_0
- wayland=1.23.1=h698ed42_0
- wcwidth=0.2.13=pyhd8ed1ab_1
- wheel=0.45.1=pyhd8ed1ab_1
Expand Down
Loading

0 comments on commit 35497a8

Please sign in to comment.