Skip to content

Commit 97b06bd

Browse files
author
Release Manager
committed
gh-36509: meson 1.2.3, numpy 1.26.1, require meson >= 1.2.0 <!-- ^^^^^ 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" --> <!-- Describe your changes here in detail --> The increased lower bound for meson is for contourpy, which was updated in #36320. ubuntu-mantic https://github.com/sagemath/sage/actions/runs/6645713841/j ob/18057705190?pr=36541#step:10:2162 ``` [contourpy-1.1.1] ../meson.build:10:17: ERROR: Meson version is 1.1.1 but project requires >= 1.2.0 ``` <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 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! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36509 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee
2 parents 1185345 + 2c46325 commit 97b06bd

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
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=39b8a4bff467fdaa5f9ee87e04715bd97a148378
3-
md5=702bfd8b0648521322d3f145a8fc70ea
4-
cksum=399123386
2+
sha1=97e766951553ec35315712f0a27d5554a010d4c3
3+
md5=69da4c63ef06c9d3bcc00ce89abb306f
4+
cksum=2424401184
55
upstream_url=https://pypi.io/packages/source/m/meson/meson-VERSION.tar.gz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.2
1+
1.2.3

build/pkgs/meson/spkg-configure.m4

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
SAGE_SPKG_CONFIGURE(
22
[meson], [
33
dnl scipy 1.11.2 needs meson >= 1.1.0
4-
AC_CACHE_CHECK([for meson >= 1.1.0], [ac_cv_path_MESON], [
4+
dnl contourpy needs meson >= 1.2.0
5+
AC_CACHE_CHECK([for meson >= 1.2.0], [ac_cv_path_MESON], [
56
AC_PATH_PROGS_FEATURE_CHECK([MESON], [meson], [
67
meson_version=`$ac_path_MESON --version 2>&1`
78
AS_IF([test -n "$meson_version"], [
8-
AX_COMPARE_VERSION([$meson_version], [ge], [1.1.0], [
9+
AX_COMPARE_VERSION([$meson_version], [ge], [1.2.0], [
910
ac_cv_path_MESON="$ac_path_MESON"
1011
ac_path_MESON_found=:
1112
])

build/pkgs/numpy/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=numpy-VERSION.tar.gz
2-
sha1=a3f9d79d7852f5d35ff35693fc31d17ea270d2d0
3-
md5=69bd28f07afbeed2bb6ecd467afcd469
4-
cksum=3599108965
2+
sha1=00f8e85fae2e2ccf8afa78e8da3a058831230ef1
3+
md5=2d770f4c281d405b690c4bcb3dbe99e2
4+
cksum=1663231076
55
upstream_url=https://pypi.io/packages/source/n/numpy/numpy-VERSION.tar.gz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.26.0
1+
1.26.1

0 commit comments

Comments
 (0)