Skip to content

Commit 21d287c

Browse files
committed
Merge branch 'pr/antonio-rojas/38749' into conda-python-13
2 parents d9ed2af + ee32f10 commit 21d287c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+417
-442
lines changed

build/pkgs/cypari/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=cypari2-VERSION.tar.gz
2-
sha1=4e9f14d218bc1cea29e03a2ceec9bf3dfbfd5eb3
3-
sha256=817606bf661b71d33e1d012421907a4f8fb09dd81b7d3e3ae179b3978020bbf1
2+
sha1=556d1a16818663ba6e6a3c9d2b14cc907a7eef4c
3+
sha256=aaa017a6a280581902f73cf5ce1695712b6598a032be14cfab81f97c475f83b8
44
upstream_url=https://files.pythonhosted.org/packages/source/c/cypari2/cypari2-VERSION.tar.gz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.0
1+
2.2.1

build/pkgs/cysignals/checksums.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=cysignals-VERSION.tar.gz
2-
sha1=76db7aa59d55e867c83b329c017382555253af43
3-
sha256=0f1e321e55a07f901c86a36a1e4497f6ff9dfe700681d0130a38c36e4eb238c3
2+
sha1=e285e209a3a5f9469cb5ade746c518cd3a600a9b
3+
sha256=89f7626dbf29db5ab3d6eff15a89978f4eb5193c320e9099bcc157dacdefd1eb
44
upstream_url=https://files.pythonhosted.org/packages/source/c/cysignals/cysignals-VERSION.tar.gz

build/pkgs/cysignals/dependencies

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cython pari | $(PYTHON_TOOLCHAIN) $(PYTHON)
1+
cython | $(PYTHON_TOOLCHAIN) meson_python $(PYTHON)
22

33
----------
44
All lines of this file are ignored except the first.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.4
1+
1.12.3

build/pkgs/cysignals/spkg-install.in

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,4 @@ cd src
33
# #29473: Override -Wp,-D_FORTIFY_SOURCE from Fedora's python3.
44
export CPPFLAGS="$CPPFLAGS -Wp,-U_FORTIFY_SOURCE"
55

6-
if [ "$SAGE_DEBUG" = yes ]; then
7-
CYSIGNALS_CONFIGURE="--enable-debug $CYSIGNALS_CONFIGURE"
8-
fi
9-
10-
sdh_configure $CYSIGNALS_CONFIGURE
116
sdh_pip_install .

build/pkgs/pari/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
tarball=pari-VERSION.tar.gz
2-
sha1=377593dfe72df13578ea0a517fcb0f81cc9758d4
3-
sha256=0efdda7515d9d954f63324c34b34c560e60f73a81c3924a71260a2cc91d5f981
4-
upstream_url=https://pari.math.u-bordeaux.fr/pub/pari/OLD/${VERSION_MAJOR}.${VERSION_MINOR}/pari-VERSION.tar.gz
2+
sha1=f5f5656a68947ef6a4841d40dd09a72fe96762a5
3+
sha256=67ba6f3071233725258541e4f174b5efbc64c65ae5115bade9edfc45f1fde5dc
4+
upstream_url=https://pari.math.u-bordeaux.fr/pub/pari/unix/pari-VERSION.tar.gz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.15.5
1+
2.17.1

build/pkgs/pari/spkg-configure.m4

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
SAGE_SPKG_CONFIGURE([pari], [
22
dnl See gp_version below on how the version is computed from MAJV.MINV.PATCHV
3-
m4_pushdef([SAGE_PARI_MINVER],["134916"])dnl this version and higher allowed
4-
dnl Do not allow Pari 2.17 or later, see #38769:
5-
m4_pushdef([SAGE_PARI_MAXVER],["135424"])dnl this version and higher not allowed
3+
m4_pushdef([SAGE_PARI_MINVER],["135245"])dnl this version and higher allowed
4+
m4_pushdef([SAGE_PARI_MAXVER],["999999"])dnl this version and higher not allowed
65
SAGE_SPKG_DEPCHECK([gmp readline], [
76
AC_PATH_PROG([GP], [gp])
87
if test x$GP = x; then dnl GP test

environment-3.11-linux-aarch64.yml

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: sage-dev
22
# Generated by conda-lock.
33
# platform: linux-aarch64
4-
# input_hash: 829fa438cd8f315e2e6cd0ccf303f1769dd4225682a4934799b990004e45482b
4+
# input_hash: 09e3b72a7aa5c065370cb8a339e14ed42ad43f0c89abc55b38713be2d4560fd9
55

66
channels:
77
- conda-forge
@@ -13,9 +13,9 @@ dependencies:
1313
- asttokens=3.0.0=pyhd8ed1ab_1
1414
- autoconf=2.71=pl5321h2148fe1_1
1515
- automake=1.17=pl5321h8af1aa0_0
16-
- babel=2.17.0=pyhd8ed1ab_0
17-
- bdw-gc=8.2.8=h5ad3122_1
18-
- beautifulsoup4=4.13.3=pyha770c72_0
16+
- babel=2.16.0=pyhd8ed1ab_1
17+
- bdw-gc=8.0.6=hd62202e_0
18+
- beautifulsoup4=4.12.3=pyha770c72_1
1919
- binutils=2.43=hf1166c9_2
2020
- binutils_impl_linux-aarch64=2.43=h4c662bb_2
2121
- binutils_linux-aarch64=2.43=hf1166c9_2
@@ -28,8 +28,8 @@ dependencies:
2828
- brotli-python=1.1.0=py311h89d996e_2
2929
- bzip2=1.0.8=h68df207_7
3030
- c-ares=1.34.4=h86ecc28_0
31-
- c-compiler=1.9.0=h6561dab_0
32-
- ca-certificates=2025.1.31=hcefe29a_0
31+
- c-compiler=1.8.0=h6561dab_1
32+
- ca-certificates=2024.12.14=hcefe29a_0
3333
- cairo=1.18.2=h83712da_1
3434
- cddlib=1!0.94m=h719063d_0
3535
- certifi=2024.12.14=pyhd8ed1ab_0
@@ -68,10 +68,10 @@ dependencies:
6868
- fontconfig=2.15.0=h8dda3cd_1
6969
- fonts-conda-ecosystem=1=0
7070
- fonts-conda-forge=1=0
71-
- fonttools=4.55.8=py311h58d527c_0
72-
- fortran-compiler=1.9.0=h25a59a9_0
73-
- fplll=5.5.0=h45c7457_0
74-
- fpylll=0.6.2=py311h2dc1a0e_0
71+
- fonttools=4.55.3=py311h58d527c_0
72+
- fortran-compiler=1.8.0=h25a59a9_1
73+
- fplll=5.4.5=hb3a790e_0
74+
- fpylll=0.6.1=py311h5d3d69a_0
7575
- freetype=2.12.1=hf0a5ef3_2
7676
- furo=2024.8.6=pyhd8ed1ab_2
7777
- gap-core=4.14.0=h1754e88_2
@@ -94,10 +94,10 @@ dependencies:
9494
- gxx=13.3.0=h8a56e6e_1
9595
- gxx_impl_linux-aarch64=13.3.0=h1211b58_1
9696
- gxx_linux-aarch64=13.3.0=h2864abd_7
97-
- h2=4.2.0=pyhd8ed1ab_0
98-
- harfbuzz=10.2.0=h785c1aa_0
99-
- hpack=4.1.0=pyhd8ed1ab_0
100-
- hyperframe=6.1.0=pyhd8ed1ab_0
97+
- h2=4.1.0=pyhd8ed1ab_1
98+
- harfbuzz=9.0.0=hbf49d6b_1
99+
- hpack=4.0.0=pyhd8ed1ab_1
100+
- hyperframe=6.0.1=pyhd8ed1ab_1
101101
- icu=75.1=hf9b3779_0
102102
- idna=3.10=pyhd8ed1ab_1
103103
- igraph=0.10.15=h207f3e5_1
@@ -106,7 +106,7 @@ dependencies:
106106
- importlib-metadata=8.6.1=pyha770c72_0
107107
- iniconfig=2.0.0=pyhd8ed1ab_1
108108
- ipykernel=6.29.5=pyh3099207_0
109-
- ipython=8.32.0=pyh907856f_0
109+
- ipython=8.30.0=pyh707e725_0
110110
- ipywidgets=8.1.5=pyhd8ed1ab_1
111111
- jedi=0.19.2=pyhd8ed1ab_1
112112
- jinja2=3.1.5=pyhd8ed1ab_0
@@ -117,7 +117,7 @@ dependencies:
117117
- keyutils=1.6.1=h4e544f5_0
118118
- kiwisolver=1.4.7=py311h75754e6_0
119119
- krb5=1.21.3=h50a48e9_0
120-
- lcalc=2.1.0=h30a6b3d_0
120+
- lcalc=2.0.5=he588f68_2
121121
- lcms2=2.16=h922389a_0
122122
- ld_impl_linux-aarch64=2.43=h80caac9_2
123123
- lerc=4.0.0=h4de3ea5_0
@@ -130,14 +130,14 @@ dependencies:
130130
- libbrotlicommon=1.1.0=h86ecc28_2
131131
- libbrotlidec=1.1.0=h86ecc28_2
132132
- libbrotlienc=1.1.0=h86ecc28_2
133-
- libcblas=3.9.0=28_hab92f65_openblas
134-
- libclang-cpp19.1=19.1.7=default_he324ac1_1
135-
- libclang13=19.1.7=default_h4390ef5_1
133+
- libcblas=3.9.0=26_linuxaarch64_openblas
134+
- libclang-cpp19.1=19.1.6=default_he324ac1_0
135+
- libclang13=19.1.6=default_h4390ef5_0
136136
- libcups=2.3.3=h405e4a8_4
137137
- libcurl=8.11.1=h6702fde_0
138138
- libdeflate=1.23=h5e3c512_0
139139
- libdrm=2.4.124=h86ecc28_0
140-
- libedit=3.1.20250104=pl5321h976ea20_0
140+
- libedit=3.1.20191231=he28a2e2_2
141141
- libegl=1.7.0=hd24410f_2
142142
- libev=4.33=h31becfc_2
143143
- libexpat=2.6.4=h5ad3122_0
@@ -158,18 +158,18 @@ dependencies:
158158
- libhomfly=1.02r6=h31becfc_1
159159
- libiconv=1.17=h31becfc_2
160160
- libjpeg-turbo=3.0.0=h31becfc_1
161-
- liblapack=3.9.0=28_h411afd4_openblas
162-
- liblapacke=3.9.0=28_hc659ca5_openblas
163-
- libllvm19=19.1.7=h2edbd07_1
164-
- liblzma=5.6.4=h86ecc28_0
165-
- liblzma-devel=5.6.4=h86ecc28_0
161+
- liblapack=3.9.0=26_linuxaarch64_openblas
162+
- liblapacke=3.9.0=26_linuxaarch64_openblas
163+
- libllvm19=19.1.6=h2edbd07_0
164+
- liblzma=5.6.3=h86ecc28_1
165+
- liblzma-devel=5.6.3=h86ecc28_1
166166
- libnghttp2=1.64.0=hc8609a4_0
167167
- libnsl=2.0.1=h31becfc_0
168168
- libntlm=1.4=hf897c2e_1002
169169
- libopenblas=0.3.28=pthreads_h9d3fd7e_1
170170
- libopengl=1.7.0=hd24410f_2
171171
- libpciaccess=0.18=h31becfc_0
172-
- libpng=1.6.46=hec79eb8_0
172+
- libpng=1.6.44=hc4a20ef_0
173173
- libpq=17.2=hd56632b_1
174174
- libsanitizer=13.3.0=ha58e236_1
175175
- libsodium=1.0.20=h68df207_0
@@ -188,6 +188,7 @@ dependencies:
188188
- libxslt=1.1.39=h1cc9640_0
189189
- libzlib=1.3.1=h86ecc28_2
190190
- linbox=1.7.0=hf74d613_1
191+
- llvm-openmp=19.1.6=h013ceaa_0
191192
- lrcalc=2.1=h5ad3122_7
192193
- m4=1.4.18=h516909a_1001
193194
- m4ri=20140914=hedfd65a_1006
@@ -208,7 +209,7 @@ dependencies:
208209
- mysql-common=9.0.1=h3f5c77f_4
209210
- mysql-libs=9.0.1=h11569fd_4
210211
- nauty=2.8.8=h31becfc_1
211-
- ncurses=6.5=ha32ae93_3
212+
- ncurses=6.5=hcccb83c_1
212213
- nest-asyncio=1.6.0=pyhd8ed1ab_1
213214
- networkx=3.4.2=pyh267e887_2
214215
- ninja=1.12.1=h70be974_0
@@ -230,8 +231,8 @@ dependencies:
230231
- perl=5.32.1=7_h31becfc_perl5
231232
- pexpect=4.9.0=pyhd8ed1ab_1
232233
- pickleshare=0.7.5=pyhd8ed1ab_1004
233-
- pillow=11.1.0=py311ha4eaa5e_0
234-
- pip=25.0=pyh8b19718_0
234+
- pillow=11.0.0=py311hb2a0dd2_0
235+
- pip=24.3.1=pyh8b19718_2
235236
- pixman=0.44.2=h86a87f0_0
236237
- pkg-config=0.29.2=hce167ba_1009
237238
- pkgconfig=1.5.5=pyhd8ed1ab_5
@@ -264,16 +265,16 @@ dependencies:
264265
- pyzmq=26.2.1=py311h826da9f_0
265266
- qd=2.3.22=h05efe27_1004
266267
- qhull=2020.2=h70be974_5
267-
- qt6-main=6.8.2=ha0a94ed_0
268+
- qt6-main=6.8.1=h0d3cc05_0
268269
- readline=8.2=h8fc344f_1
269270
- requests=2.32.3=pyhd8ed1ab_1
270271
- rw=0.9=h31becfc_2
271272
- sagemath-db-elliptic-curves=0.8.1=hecc5488_0
272273
- sagemath-db-graphs=20210214=hd8ed1ab_0
273274
- sagemath-db-polytopes=20170220=1
274-
- scipy=1.15.1=py311h13dcf5b_0
275-
- setuptools=75.8.0=pyhff2d567_0
276-
- singular=4.4.1=hee12f27_0
275+
- scipy=1.14.1=py311h5912639_2
276+
- setuptools=75.6.0=pyhff2d567_1
277+
- singular=4.4.0=hee12f27_1
277278
- six=1.17.0=pyhd8ed1ab_0
278279
- snowballstemmer=2.2.0=pyhd8ed1ab_0
279280
- soupsieve=2.5=pyhd8ed1ab_1

0 commit comments

Comments
 (0)