From 2b6c5314867ebf2f5e1370cacbfe139763bf30ec Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 24 Nov 2023 18:38:07 -0700 Subject: [PATCH] package/python-matplotlib: bump to version 3.8.2 Add new python-contourpy runtime dependency. Add new python-pybind dependency. Add new host-python-setuptools-scm build dependency. Update setup.cfg to new mplsetup.cfg install location. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-matplotlib/Config.in | 2 ++ package/python-matplotlib/python-matplotlib.hash | 5 +++-- package/python-matplotlib/python-matplotlib.mk | 8 +++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index cc0d830f4f..b3d84e2b43 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -8,7 +8,9 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB select BR2_PACKAGE_FREETYPE # runtime select BR2_PACKAGE_LIBPNG # runtime select BR2_PACKAGE_PYTHON_CERTIFI # runtime + select BR2_PACKAGE_PYTHON_CONTOURPY # runtime select BR2_PACKAGE_PYTHON_CYCLER + select BR2_PACKAGE_PYTHON_PYBIND select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_KIWISOLVER # runtime diff --git a/package/python-matplotlib/python-matplotlib.hash b/package/python-matplotlib/python-matplotlib.hash index 0d7117811c..c2fb907e2c 100644 --- a/package/python-matplotlib/python-matplotlib.hash +++ b/package/python-matplotlib/python-matplotlib.hash @@ -1,4 +1,5 @@ -# sha256 from https://pypi.org/project/matplotlib/#files -sha256 fc4f526dfdb31c9bd6b8ca06bf9fab663ca12f3ec9cdf4496fb44bc680140318 matplotlib-3.4.3.tar.gz +# md5, sha256 from https://pypi.org/pypi/matplotlib/json +md5 72896b8c240903ebddc47be6451d813b matplotlib-3.8.2.tar.gz +sha256 01a978b871b881ee76017152f1f1a0cbf6bd5f7b8ff8c96df0df1bd57d8755a1 matplotlib-3.8.2.tar.gz # Locally computed sha256 checksums sha256 5a1a81ea301728c8bba2933da832c0cd62229daf20893a024ab3d53244468dbc LICENSE/LICENSE diff --git a/package/python-matplotlib/python-matplotlib.mk b/package/python-matplotlib/python-matplotlib.mk index 650aac9bd9..4fd2b5f432 100644 --- a/package/python-matplotlib/python-matplotlib.mk +++ b/package/python-matplotlib/python-matplotlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_MATPLOTLIB_VERSION = 3.4.3 +PYTHON_MATPLOTLIB_VERSION = 3.8.2 PYTHON_MATPLOTLIB_SOURCE = matplotlib-$(PYTHON_MATPLOTLIB_VERSION).tar.gz -PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/21/37/197e68df384ff694f78d687a49ad39f96c67b8d75718bc61503e1676b617 +PYTHON_MATPLOTLIB_SITE = https://files.pythonhosted.org/packages/fb/ab/38a0e94cb01dacb50f06957c2bed1c83b8f9dac6618988a37b2487862944 PYTHON_MATPLOTLIB_LICENSE = Python-2.0 PYTHON_MATPLOTLIB_LICENSE_FILES = LICENSE/LICENSE PYTHON_MATPLOTLIB_DEPENDENCIES = \ @@ -14,8 +14,10 @@ PYTHON_MATPLOTLIB_DEPENDENCIES = \ host-pkgconf \ host-python-certifi \ host-python-numpy \ + host-python-setuptools-scm \ libpng \ python-cycler \ + python-pybind \ qhull PYTHON_MATPLOTLIB_SETUP_TYPE = setuptools @@ -24,7 +26,7 @@ PYTHON_MATPLOTLIB_DEPENDENCIES += python-pyqt5 endif define PYTHON_MATPLOTLIB_COPY_SETUP_CFG - cp $(PYTHON_MATPLOTLIB_PKGDIR)/setup.cfg $(@D)/setup.cfg + cp $(PYTHON_MATPLOTLIB_PKGDIR)/setup.cfg $(@D)/mplsetup.cfg endef PYTHON_MATPLOTLIB_PRE_CONFIGURE_HOOKS += PYTHON_MATPLOTLIB_COPY_SETUP_CFG