diff --git a/lang/python/numpy/Makefile b/lang/python/numpy/Makefile index 4b319b59a8..1e0291a8d9 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.25.2 +PKG_VERSION:=1.26.2 PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760 +PKG_HASH:=f65738447676ab5777f11e6bbbdb8ce11b785e105f690bc45966574816b6d3ea PKG_MAINTAINER:=Alexandru Ardelean @@ -21,7 +21,7 @@ PKG_CPE_ID:=cpe:/a:numpy:numpy PKG_CONFIG_DEPENDS:= \ CONFIG_NUMPY_OPENBLAS_SUPPORT -PKG_BUILD_DEPENDS:=python-cython/host +PKG_BUILD_DEPENDS:=python-cython/host pyproject-metadata/host # Ensure numpy does not find openblas if openblas support is not enabled PYTHON3_PKG_BUILD_VARS:= \ diff --git a/lang/python/numpy/patches/001-unpin-build-dependencies.patch b/lang/python/numpy/patches/001-unpin-build-dependencies.patch deleted file mode 100644 index dbfaea505c..0000000000 --- a/lang/python/numpy/patches/001-unpin-build-dependencies.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -4,11 +4,11 @@ - #build-backend = "mesonpy" - requires = [ - # setuptools, wheel and Cython are needed for the setup.py based build -- "setuptools==59.2.0", -+ "setuptools>=59.2.0", - # `wheel` is needed for non-isolated builds, given that `meson-python` - # doesn't list it as a runtime requirement (at least in 0.11.0) - it's - # likely to be removed as a dependency in meson-python 0.12.0. -- "wheel==0.38.1", -+ "wheel>=0.38.1", - "Cython>=0.29.34,<3.0", - # "meson-python>=0.10.0", - ] diff --git a/lang/python/numpy/patches/002-avoid-build-user-config-files.patch b/lang/python/numpy/patches/002-avoid-build-user-config-files.patch index cf7faf4edc..c3d70207e2 100644 --- a/lang/python/numpy/patches/002-avoid-build-user-config-files.patch +++ b/lang/python/numpy/patches/002-avoid-build-user-config-files.patch @@ -1,6 +1,6 @@ --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -403,7 +403,7 @@ def get_standard_file(fname): +@@ -404,7 +404,7 @@ def get_standard_file(fname): pass else: user_file = os.path.join(f, fname) diff --git a/lang/python/numpy/patches/003-without-vendored-meson.patch b/lang/python/numpy/patches/003-without-vendored-meson.patch new file mode 100644 index 0000000000..ef6761bfe3 --- /dev/null +++ b/lang/python/numpy/patches/003-without-vendored-meson.patch @@ -0,0 +1,22 @@ +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,6 +1,6 @@ + [build-system] +-build-backend = "mesonpy" +-backend-path = ['./vendored-meson/meson-python'] ++#build-backend = "mesonpy" ++#backend-path = ['./vendored-meson/meson-python'] + requires = [ + "Cython>=0.29.34,<3.1", + # All dependencies of the vendored meson-python (except for meson, because +@@ -194,8 +194,8 @@ repair-wheel-command = "" + [tool.spin] + package = 'numpy' + +-[tool.spin.meson] +-cli = 'vendored-meson/meson/meson.py' ++#[tool.spin.meson] ++#cli = 'vendored-meson/meson/meson.py' + + [tool.spin.commands] + "Build" = [