Skip to content

Commit 4d0fa68

Browse files
author
Release Manager
committed
gh-35082: Upgrade scipy to 1.10.1 <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> ### 📚 Description <!-- Describe your changes here in detail --> The upgrade also includes upgrades of `meson`, `meson_python`, and `pythran`. <!-- Why is this change required? What problem does it solve? --> <!-- If it resolves an open issue, please link to the issue here. For example "Closes #1337" --> Closes #34842 ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [x] I have made sure that the title is self-explanatory and the description concisely explains the PR. - [x] I have linked an issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open pull requests that this PR logically depends on --> <!-- - #xyz: short description why this is a dependency - #abc: ... --> URL: #35082 Reported by: Matthias Köppe Reviewer(s): François Bissey
2 parents d91eb2e + 439ea59 commit 4d0fa68

File tree

10 files changed

+39
-18
lines changed

10 files changed

+39
-18
lines changed

‎build/pkgs/meson/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=meson-VERSION.tar.gz
2-
sha1=3bce963302f547547c82fda35f84838ebc608e8a
3-
md5=b2f2757b5dd84cc754b9df53ce37a175
4-
cksum=2257545181
2+
sha1=a2d102eb6a37307c9b67283e9764ed57cf286223
3+
md5=843ba549bb2a199d9e04092116a7e749
4+
cksum=2108460988
55
upstream_url=https://pypi.io/packages/source/m/meson/meson-VERSION.tar.gz

‎build/pkgs/meson/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.63.3
1+
1.0.1

‎build/pkgs/meson/spkg-configure.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
SAGE_SPKG_CONFIGURE(
22
[meson], [
3-
AC_CACHE_CHECK([for meson >= 0.63.3], [ac_cv_path_MESON], [
3+
AC_CACHE_CHECK([for meson >= 0.64], [ac_cv_path_MESON], [
44
AC_PATH_PROGS_FEATURE_CHECK([MESON], [meson], [
55
meson_version=`$ac_path_MESON --version 2>&1`
66
AS_IF([test -n "$meson_version"], [
7-
AX_COMPARE_VERSION([$meson_version], [ge], [0.63.3], [
7+
AX_COMPARE_VERSION([$meson_version], [ge], [0.64], [
88
ac_cv_path_MESON="$ac_path_MESON"
99
ac_path_MESON_found=:
1010
])

‎build/pkgs/meson_python/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=meson_python-VERSION.tar.gz
2-
sha1=09035196e1576073a7e4acac1f010e5e07e55f89
3-
md5=60856897b63bc91e1f953bf29f410be4
4-
cksum=3201302061
2+
sha1=bdaf002dc1ef314c32e2be76f3b2872f1282c4cc
3+
md5=39be4f0b7f036e1d5db4a76fdb031355
4+
cksum=2636510839
55
upstream_url=https://pypi.io/packages/source/m/meson_python/meson_python-VERSION.tar.gz

‎build/pkgs/meson_python/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.11.0
1+
0.12.1

‎build/pkgs/meson_python/patches/ARCHFLAGS_empty.patch‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
commit caa435144b1b4fa40c51558f15fd8dae2c0b5868
2+
Author: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
3+
Date: Sat Mar 11 10:16:56 2023 -0800
4+
5+
BUG: handle ARCHFLAGS set to the empty string
6+
7+
diff --git a/mesonpy/__init__.py b/mesonpy/__init__.py
8+
index e312059..d798f4c 100644
9+
--- a/mesonpy/__init__.py
10+
+++ b/mesonpy/__init__.py
11+
@@ -686,8 +686,8 @@ class Project():
12+
13+
# setuptools-like ARCHFLAGS environment variable support
14+
if sysconfig.get_platform().startswith('macosx-'):
15+
- archflags = self._env.get('ARCHFLAGS')
16+
- if archflags is not None:
17+
+ archflags = self._env.get('ARCHFLAGS', '').strip()
18+
+ if archflags:
19+
arch, *other = filter(None, (x.strip() for x in archflags.split('-arch')))
20+
if other:
21+
raise ConfigError(f'Multi-architecture builds are not supported but $ARCHFLAGS={archflags!r}')

‎build/pkgs/pythran/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=pythran-VERSION.tar.gz
2-
sha1=ed5630b0879be9c59885d83c5a24fcd5dfbca5af
3-
md5=d2961ece35b4b9f44a84ef31df1b21ff
4-
cksum=399652957
2+
sha1=71bc7c868cf011d184a013211f4195d8f9c606a2
3+
md5=168c31e8d108f26440b663b44cd99379
4+
cksum=2086161839
55
upstream_url=https://pypi.io/packages/source/p/pythran/pythran-VERSION.tar.gz

‎build/pkgs/pythran/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.12.0
1+
0.12.1

‎build/pkgs/scipy/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=scipy-VERSION.tar.gz
2-
sha1=55fb286ab1a0b66a7439c5cc76e3c80e9de409ec
3-
md5=83b0d9eab2ce79b7fe5888f119adee64
4-
cksum=1605676871
2+
sha1=ff83163396a70276c0441b541befc485b471b27b
3+
md5=de3db61d840456634ba37f2b5816e049
4+
cksum=3826133895
55
upstream_url=https://pypi.io/packages/source/s/scipy/scipy-VERSION.tar.gz

‎build/pkgs/scipy/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.9.3
1+
1.10.1

0 commit comments

Comments
 (0)