diff --git a/lang/python/numpy/Makefile b/lang/python/numpy/Makefile index 3cd9827b3e..27c40d54d4 100644 --- a/lang/python/numpy/Makefile +++ b/lang/python/numpy/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=numpy -PKG_VERSION:=1.26.4 +PKG_VERSION:=2.1.0 PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010 +PKG_HASH:=7dc90da0081f7e1da49ec4e398ede6a8e9cc4f5ebe5f9e06b443ed889ee9aaa2 PKG_MAINTAINER:=Alexandru Ardelean diff --git a/lang/python/numpy/patches/003-without-vendored-meson.patch b/lang/python/numpy/patches/003-without-vendored-meson.patch index a2a9c5f743..3dabd11fa8 100644 --- a/lang/python/numpy/patches/003-without-vendored-meson.patch +++ b/lang/python/numpy/patches/003-without-vendored-meson.patch @@ -1,18 +1,17 @@ --- a/pyproject.toml +++ b/pyproject.toml -@@ -1,8 +1,8 @@ +@@ -1,7 +1,7 @@ [build-system] -build-backend = "mesonpy" +#build-backend = "mesonpy" requires = [ - "Cython>=0.29.34,<3.1", -- "meson-python>=0.15.0,<0.16.0", -+# "meson-python>=0.15.0,<0.16.0", +- "meson-python>=0.15.0", ++# "meson-python>=0.15.0", + "Cython>=3.0.6", # keep in sync with version check in meson.build ] - [project] -@@ -181,14 +181,14 @@ environment = {PKG_CONFIG_PATH="/opt/32/ - config-settings = "setup-args=--vsenv setup-args=-Dallow-noblas=true" +@@ -181,8 +181,8 @@ select = "*-win32" + config-settings = "setup-args=--vsenv setup-args=-Dallow-noblas=true build-dir=build" repair-wheel-command = "" -[tool.meson-python] @@ -20,6 +19,9 @@ +#[tool.meson-python] +#meson = 'vendored-meson/meson/meson.py' + [tool.meson-python.args] + install = ['--tags=runtime,python-runtime,tests,devel'] +@@ -190,8 +190,8 @@ install = ['--tags=runtime,python-runtim [tool.spin] package = 'numpy' diff --git a/lang/python/numpy/patches/004-workaround-for-multiple-top-level-packages-discovered.patch b/lang/python/numpy/patches/004-workaround-for-multiple-top-level-packages-discovered.patch new file mode 100644 index 0000000000..c5424b50c9 --- /dev/null +++ b/lang/python/numpy/patches/004-workaround-for-multiple-top-level-packages-discovered.patch @@ -0,0 +1,12 @@ +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -59,6 +59,9 @@ download = "https://pypi.org/project/num + tracker = "https://github.com/numpy/numpy/issues" + "release notes" = "https://numpy.org/doc/stable/release" + ++[tool.setuptools] ++py-modules = [] ++ + [tool.towncrier] + single_file = false + filename = "doc/source/release/notes-towncrier.rst"