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.

Sign up for GitHub

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

meson 1.2.3, numpy 1.26.1, require meson >= 1.2.0 #36509

Merged
merged 3 commits into from
Oct 31, 2023
Merged

meson 1.2.3, numpy 1.26.1, require meson >= 1.2.0 #36509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8335565
build/pkgs/meson: Update to 1.2.3
mkoeppe Oct 23, 2023
94d13e9
build/pkgs/numpy: Update to 1.26.1
mkoeppe Oct 23, 2023
2c46325
build/pkgs/meson/spkg-configure.m4: Require >= 1.2.0 (for contourpy)
mkoeppe Oct 25, 2023
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/meson/checksums.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=meson-VERSION.tar.gz
sha1=39b8a4bff467fdaa5f9ee87e04715bd97a148378
md5=702bfd8b0648521322d3f145a8fc70ea
cksum=399123386
sha1=97e766951553ec35315712f0a27d5554a010d4c3
md5=69da4c63ef06c9d3bcc00ce89abb306f
cksum=2424401184
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.2
1.2.3
5 changes: 3 additions & 2 deletions build/pkgs/meson/spkg-configure.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
SAGE_SPKG_CONFIGURE(
[meson], [
dnl scipy 1.11.2 needs meson >= 1.1.0
AC_CACHE_CHECK([for meson >= 1.1.0], [ac_cv_path_MESON], [
dnl contourpy needs meson >= 1.2.0
AC_CACHE_CHECK([for meson >= 1.2.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], [1.1.0], [
AX_COMPARE_VERSION([$meson_version], [ge], [1.2.0], [
ac_cv_path_MESON="$ac_path_MESON"
ac_path_MESON_found=:
])
Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/numpy/checksums.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tarball=numpy-VERSION.tar.gz
sha1=a3f9d79d7852f5d35ff35693fc31d17ea270d2d0
md5=69bd28f07afbeed2bb6ecd467afcd469
cksum=3599108965
sha1=00f8e85fae2e2ccf8afa78e8da3a058831230ef1
md5=2d770f4c281d405b690c4bcb3dbe99e2
cksum=1663231076
upstream_url=https://pypi.io/packages/source/n/numpy/numpy-VERSION.tar.gz
2 changes: 1 addition & 1 deletion build/pkgs/numpy/package-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.26.0
1.26.1