Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades: scipy 1.11 and dependencies #36112

Merged
merged 17 commits into from
Sep 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build/pkgs/cmake/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=cmake-VERSION.tar.gz
sha1=256d6a57a57fa6ceaacd6a2daf708baefd33850c
md5=226dd564164372f9f7d1e21e38e6e8c5
cksum=2080281918
sha1=3e9b980bfb16974f57ca02b5e2b403a2ef2d4eca
md5=7228f5fcc8a858fdeac27e29bda0c144
cksum=2027526722
upstream_url=https://github.com/Kitware/CMake/releases/download/vVERSION/cmake-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/cmake/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.24.3
3.27.3
6 changes: 3 additions & 3 deletions build/pkgs/gast/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=gast-VERSION.tar.gz
sha1=a84811eedebc5bca94b4eae978aab5f2c805b106
md5=fdff900805e03e9dd76d377eb4cbaed7
cksum=387443419
sha1=6c113cf8d33cc654d33210335103485ab41d3dbb
md5=907c689e3fdbc7a48cc010e665195baa
cksum=218846575
upstream_url=https://pypi.io/packages/source/g/gast/gast-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/gast/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.3
0.5.4
6 changes: 3 additions & 3 deletions build/pkgs/meson/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=meson-VERSION.tar.gz
sha1=a2d102eb6a37307c9b67283e9764ed57cf286223
md5=843ba549bb2a199d9e04092116a7e749
cksum=2108460988
sha1=087da0ecbc065bb40361ba683b55c20cb42a948a
md5=e3cc846536189aacd7d01858a45ca9af
cksum=4011973902
upstream_url=https://pypi.io/packages/source/m/meson/meson-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/meson/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.1
1.2.1
5 changes: 3 additions & 2 deletions build/pkgs/meson/spkg-configure.m4
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
SAGE_SPKG_CONFIGURE(
[meson], [
AC_CACHE_CHECK([for meson >= 0.64], [ac_cv_path_MESON], [
dnl scipy 1.11.2 needs meson >= 1.1.0
AC_CACHE_CHECK([for meson >= 1.1.0], [ac_cv_path_MESON], [
AC_PATH_PROGS_FEATURE_CHECK([MESON], [meson], [
meson_version=`$ac_path_MESON --version 2>&1`
AS_IF([test -n "$meson_version"], [
AX_COMPARE_VERSION([$meson_version], [ge], [0.64], [
AX_COMPARE_VERSION([$meson_version], [ge], [1.1.0], [
ac_cv_path_MESON="$ac_path_MESON"
ac_path_MESON_found=:
])
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/meson_python/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=meson_python-VERSION.tar.gz
sha1=bdaf002dc1ef314c32e2be76f3b2872f1282c4cc
md5=39be4f0b7f036e1d5db4a76fdb031355
cksum=2636510839
sha1=e52e84fcd84ea7dd8c11f464390786686a1be8e6
md5=0db4483e30df43dbd465254be9c7db8a
cksum=1452585711
upstream_url=https://pypi.io/packages/source/m/meson_python/meson_python-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/meson_python/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12.1
0.13.2
21 changes: 0 additions & 21 deletions build/pkgs/meson_python/patches/ARCHFLAGS_empty.patch

This file was deleted.

6 changes: 3 additions & 3 deletions build/pkgs/ninja_build/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=ninja_build-VERSION.tar.gz
sha1=f8c9279bdd4efc63b1a6be3b8c5a5031699af9ac
md5=7d1a1a2f5cdc06795b3054df5c17d5ef
cksum=3142198237
sha1=938723cdfc7a6f7c8f84c83b9a2cecdf1e5e1ad3
md5=32151c08211d7ca3c1d832064f6939b0
cksum=4040304461
upstream_url=https://github.com/ninja-build/ninja/archive/refs/tags/vVERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/ninja_build/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.0
1.11.1
6 changes: 3 additions & 3 deletions build/pkgs/pybind11/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=pybind11-VERSION.tar.gz
sha1=d0e6e22c2ce36fad4bb60dbac4d6d498ceb464df
md5=0b181dbb44c3cc632e724cef5081cae1
cksum=4287838207
sha1=3c75333a9056f0be18eb612803cd46a2bb0c87fc
md5=67c58224e41c442e47fa84e7789c2c39
cksum=419587142
upstream_url=https://pypi.io/packages/source/p/pybind11/pybind11-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/pybind11/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.10.1
2.11.1
6 changes: 3 additions & 3 deletions build/pkgs/pyproject_metadata/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=pyproject-metadata-VERSION.tar.gz
sha1=c2b7679b1e56a341aa00c186c0d1a6bbd7bd5c2c
md5=e13b11cb723da96f8397addddca963cc
cksum=2246727402
sha1=41fba5c33917d77b9364fadb76e590e86789634d
md5=ca5e9527cff96153a976e14530b53746
cksum=2053869519
upstream_url=https://pypi.io/packages/source/p/pyproject_metadata/pyproject-metadata-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/pyproject_metadata/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.1
0.7.1
6 changes: 3 additions & 3 deletions build/pkgs/pythran/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=pythran-VERSION.tar.gz
sha1=71bc7c868cf011d184a013211f4195d8f9c606a2
md5=168c31e8d108f26440b663b44cd99379
cksum=2086161839
sha1=dd675e9ccc93379b529687328ca558d5617eb1c6
md5=3090288af50566af75cb058d1878aaad
cksum=3968085663
upstream_url=https://pypi.io/packages/source/p/pythran/pythran-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/pythran/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12.1
0.13.1
2 changes: 1 addition & 1 deletion build/pkgs/sagelib/dependencies
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython ecl eclib ecm flint libgd gap giac givaro glpk gmpy2 gsl iml importlib_metadata importlib_resources jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica typing_extensions $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup pythran

----------
All lines of this file are ignored except the first.
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/scipy/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=scipy-VERSION.tar.gz
sha1=ff83163396a70276c0441b541befc485b471b27b
md5=de3db61d840456634ba37f2b5816e049
cksum=3826133895
sha1=856f8ac8498751b72d678ef64b88e436d04a957d
md5=27baf613b6cf3f9600a05161f132151c
cksum=1656738318
upstream_url=https://pypi.io/packages/source/s/scipy/scipy-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/scipy/install-requires.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# deprecations cannot be introduced in micro releases.
# SciPy devs wait "at least 6 months", "in practice two (minor) releases"
# from deprecation to removal of a feature.
scipy >=1.5, <1.11
scipy >=1.5, <1.12
2 changes: 1 addition & 1 deletion build/pkgs/scipy/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.1
1.11.2