[packages/python-matplotlib] - updated to 2.2.5 (latest version with python2 support) - removed outdated py38 patch - added syste

qboosh qboosh at pld-linux.org
Wed Apr 1 18:01:35 CEST 2020 

commit 17a0057e970d30ff12551b5acaa71c7008a90988
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Apr 1 18:01:25 2020 +0200

    - updated to 2.2.5 (latest version with python2 support)
    - removed outdated py38 patch
    - added system-qhull patch (use system qhull without need of .pc file retired by upstream)

 py38.patch                           |  26 ---------
 python-matplotlib-system-qhull.patch |  28 ++++++++++
 python-matplotlib.spec               | 103 ++++++++++++++++-------------------
 3 files changed, 74 insertions(+), 83 deletions(-)
---
diff --git a/python-matplotlib.spec b/python-matplotlib.spec
index bd2632e..5a542cb 100644
--- a/python-matplotlib.spec
+++ b/python-matplotlib.spec
@@ -5,26 +5,24 @@
 %bcond_with	tests	# unit tests [many failures as of 1.5.3]
 
 # TODO:
-# - use system fonts (mpl-data/fonts/ttf/cm*.ttf) and metrics (mpl-data/fonts/{afm,pdfcorefonts}/*.afm) in mpl-data dir?
-# - use system six? (instead of matplotlib.externals.six)
+# - use system fonts (mpl-data/fonts/ttf/{STIX,cm}*.ttf) and metrics (mpl-data/fonts/{afm,pdfcorefonts}/*.afm) in mpl-data dir?
 # - make sure all dependencies that are available for Python3 are build for Python3
 #   and included in BR when neccessary
 %define		module	matplotlib
 Summary:	Matlab(TM) style Python plotting package
 Summary(pl.UTF-8):	Pakiet do rysowania w Pythonie podobny do Matlaba(TM)
 Name:		python-%{module}
-Version:	1.5.3
-Release:	6
+Version:	2.2.5
+Release:	1
 License:	PSF
 Group:		Libraries/Python
 #Source0Download: https://github.com/matplotlib/matplotlib/releases
-# TODO: https://github.com/matplotlib/matplotlib/archive/v%{version}/matplotlib-%{version}.tar.gz
-Source0:	https://github.com/matplotlib/matplotlib/archive/v%{version}.tar.gz
-# Source0-md5:	079d9d8cd9910e00ed1236fb44a518a7
-Patch0:		py38.patch
+Source0:	https://github.com/matplotlib/matplotlib/archive/v%{version}/matplotlib-%{version}.tar.gz
+# Source0-md5:	8c49e6086ec06f3b5e9a1b7ad1ac37ff
+Patch0:		%{name}-system-qhull.patch
 URL:		https://matplotlib.org/
-BuildRequires:	agg-devel
-BuildRequires:	freetype-devel >= 1:2.3
+#BuildRequires:	agg-devel
+BuildRequires:	freetype-devel >= 1:2.6.1
 BuildRequires:	ghostscript
 BuildRequires:	gtk+3 >= 3.0
 BuildRequires:	libpng-devel >= 1.2
@@ -33,7 +31,7 @@ BuildRequires:	ncurses-devel
 BuildRequires:	pkgconfig
 # /usr/bin/pdftops
 BuildRequires:	poppler-progs
-BuildRequires:	qhull >= 2003.1
+BuildRequires:	qhull-devel >= 2015.2
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.714
 # /usr/bin/dvipng
@@ -41,56 +39,62 @@ BuildRequires:	texlive
 BuildRequires:	tk-devel
 %if %{with python2}
 BuildRequires:	gtk+2-devel >= 1:2.0
-BuildRequires:	python >= 1:2.6
+BuildRequires:	python >= 1:2.7
 BuildRequires:	python-PyQt4
 BuildRequires:	python-PyQt5
-BuildRequires:	python-cycler
-BuildRequires:	python-dateutil
-BuildRequires:	python-devel
-BuildRequires:	python-numpy-devel >= 1:1.6
+BuildRequires:	python-backports.functools_lru_cache
+BuildRequires:	python-cycler >= 0.10
+BuildRequires:	python-dateutil >= 2.1
+BuildRequires:	python-devel >= 1:2.7
+BuildRequires:	python-numpy-devel >= 1:1.7.1
 # or cairocffi
 BuildRequires:	python-pycairo
 BuildRequires:	python-pygobject3-devel >= 3.0
 BuildRequires:	python-pygtk-devel >= 1:2.2.0
-BuildRequires:	python-pyparsing >= 1.5.6
+BuildRequires:	python-pyparsing >= 2.1.7
 BuildRequires:	python-pytz
 BuildRequires:	python-setuptools
 # for import pyqtconfig needed by qt detection.
 BuildRequires:	python-sip-devel
+BuildRequires:	python-six >= 1.10
+BuildRequires:	python-subprocess32
 BuildRequires:	python-tkinter
 BuildRequires:	python-tornado
-BuildRequires:	python-wxPython >= 2.8
+BuildRequires:	python-wxPython >= 2.9
 %if %{with tests}
+BuildRequires:	python-kiwisolver >= 1.0.1
 BuildRequires:	python-mock
-BuildRequires:	python-nose >= 0.11.1
+BuildRequires:	python-pytest >= 3.6
 %endif
 %endif
 %if %{with python3}
-BuildRequires:	python3 >= 1:3.3
+BuildRequires:	python3 >= 1:3.4
 BuildRequires:	python3-2to3
 BuildRequires:	python3-PyQt4
 BuildRequires:	python3-PyQt5
-BuildRequires:	python3-cycler
+BuildRequires:	python3-cycler >= 0.10
 BuildRequires:	python3-dateutil >= 2.2
-BuildRequires:	python3-devel
-BuildRequires:	python3-numpy-devel >= 1:1.6
+BuildRequires:	python3-devel >= 1:3.4
+BuildRequires:	python3-numpy-devel >= 1:1.7.1
 # or cairocffi
 BuildRequires:	python3-pycairo
 BuildRequires:	python3-pygobject3-devel >= 3.0
-BuildRequires:	python3-pyparsing >= 2.1.3
+BuildRequires:	python3-pyparsing >= 2.1.7
 BuildRequires:	python3-pytz
+BuildRequires:	python3-six >= 1.10
 BuildRequires:	python3-setuptools
 # for import pyqtconfig needed by qt detection.
 BuildRequires:	python3-sip-devel
 BuildRequires:	python3-tkinter
 BuildRequires:	python3-tornado
-#BuildRequires:	python3-wxPython >= 2.8
+#BuildRequires:	python3-wxPython >= 2.9
 %if %{with tests}
-BuildRequires:	python3-nose >= 0.11.1
+BuildRequires:	python3-kiwisolver >= 1.0.1
+BuildRequires:	python3-pytest >= 3.6
 %endif
 %endif
-Requires:	freetype >= 1:2.3
-Requires:	python-modules >= 1:2.6
+Requires:	freetype >= 1:2.6.1
+Requires:	python-modules >= 1:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -109,8 +113,8 @@ przechodzących z Matlaba.
 Summary:	Matlab(TM) style Python 3 plotting package
 Summary(pl.UTF-8):	Pakiet do rysowania w Pythonie 3 podobny do Matlaba(TM)
 Group:		Libraries/Python
-Requires:	freetype >= 1:2.3
-Requires:	python3-modules >= 1:3.3
+Requires:	freetype >= 1:2.6.1
+Requires:	python3-modules >= 1:3.4
 
 %description -n python3-%{module}
 matplotlib strives to produce publication quality 2D graphics using
@@ -158,18 +162,14 @@ rm -rf $RPM_BUILD_ROOT
 %py_postclean
 
 # matplotlib can use system fonts, so drop these copies
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/matplotlib/mpl-data/fonts/ttf/Vera*.ttf
-
-%{__rm} -r $RPM_BUILD_ROOT%{py_sitedir}/%{module}/tests
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/matplotlib/mpl-data/fonts/ttf/DejaVu*.ttf
 %endif
 
 %if %{with python3}
 %py3_install
 
 # matplotlib can use system fonts, so drop these copies
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/matplotlib/mpl-data/fonts/ttf/Vera*.ttf
-
-%{__rm} -r $RPM_BUILD_ROOT%{py3_sitedir}/%{module}/tests
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/matplotlib/mpl-data/fonts/ttf/DejaVu*.ttf
 %endif
 
 %clean
@@ -178,23 +178,19 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
-%doc CHANGELOG README.rst
+%doc README.rst LICENSE/LICENSE
 %dir %{py_sitedir}/%{module}
 %{py_sitedir}/%{module}/*.py[co]
 %attr(755,root,root) %{py_sitedir}/%{module}/*.so
-%dir %{py_sitedir}/%{module}/axes
-%{py_sitedir}/%{module}/axes/*.py[co]
+%{py_sitedir}/%{module}/axes
 %dir %{py_sitedir}/%{module}/backends
 %{py_sitedir}/%{module}/backends/*.py[co]
 %attr(755,root,root) %{py_sitedir}/%{module}/backends/*.so
 %dir %{py_sitedir}/%{module}/backends/qt_editor
 %{py_sitedir}/%{module}/backends/qt_editor/*.py[co]
-%dir %{py_sitedir}/%{module}/backends/Matplotlib.nib
-%{py_sitedir}/%{module}/backends/Matplotlib.nib/*.nib
 %{py_sitedir}/%{module}/backends/web_backend
+%{py_sitedir}/%{module}/cbook
 %{py_sitedir}/%{module}/compat
-%{py_sitedir}/%{module}/delaunay
-%{py_sitedir}/%{module}/externals
 %{py_sitedir}/%{module}/mpl-data
 %{py_sitedir}/%{module}/projections
 %{py_sitedir}/%{module}/sphinxext
@@ -204,23 +200,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %{py_sitedir}/mpl_toolkits
 %{py_sitedir}/pylab.py[co]
-%if "%{py_ver}" > "2.4"
-%{py_sitedir}/%{module}-*.egg-info
-%{py_sitedir}/%{module}-*.pth
-%endif
+%{py_sitedir}/%{module}-%{version}-py*.egg-info
+%{py_sitedir}/%{module}-%{version}-py*-nspkg.pth
 %endif
 
 %if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
-%doc CHANGELOG README.rst
+%doc README.rst LICENSE/LICENSE
 %dir %{py3_sitedir}/%{module}
 %{py3_sitedir}/%{module}/*.py
 %{py3_sitedir}/%{module}/__pycache__
 %attr(755,root,root) %{py3_sitedir}/%{module}/*.so
-%dir %{py3_sitedir}/%{module}/axes
-%{py3_sitedir}/%{module}/axes/*.py
-%{py3_sitedir}/%{module}/axes/__pycache__
+%{py3_sitedir}/%{module}/axes
 %dir %{py3_sitedir}/%{module}/backends
 %{py3_sitedir}/%{module}/backends/*.py
 %{py3_sitedir}/%{module}/backends/__pycache__
@@ -228,12 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py3_sitedir}/%{module}/backends/qt_editor
 %{py3_sitedir}/%{module}/backends/qt_editor/*.py
 %{py3_sitedir}/%{module}/backends/qt_editor/__pycache__
-%dir %{py3_sitedir}/%{module}/backends/Matplotlib.nib
-%{py3_sitedir}/%{module}/backends/Matplotlib.nib/*.nib
 %{py3_sitedir}/%{module}/backends/web_backend
+%{py3_sitedir}/%{module}/cbook
 %{py3_sitedir}/%{module}/compat
-%{py3_sitedir}/%{module}/delaunay
-%{py3_sitedir}/%{module}/externals
 %{py3_sitedir}/%{module}/mpl-data
 %{py3_sitedir}/%{module}/projections
 %{py3_sitedir}/%{module}/sphinxext
@@ -243,6 +232,6 @@ rm -rf $RPM_BUILD_ROOT
 %{py3_sitedir}/mpl_toolkits
 %{py3_sitedir}/pylab.py
 %{py3_sitedir}/__pycache__
-%{py3_sitedir}/%{module}-*.egg-info
-%{py3_sitedir}/%{module}-*.pth
+%{py3_sitedir}/%{module}-%{version}-py*.egg-info
+%{py3_sitedir}/%{module}-%{version}-py*-nspkg.pth
 %endif
diff --git a/py38.patch b/py38.patch
deleted file mode 100644
index 6f171e5..0000000
--- a/py38.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- matplotlib-1.5.3/setup.py~	2016-09-09 04:50:50.000000000 +0200
-+++ matplotlib-1.5.3/setup.py	2019-10-29 14:13:54.317435965 +0100
-@@ -12,23 +12,6 @@ from setuptools.command.test import test
- 
- import sys
- 
--# distutils is breaking our sdists for files in symlinked dirs.
--# distutils will copy if os.link is not available, so this is a hack
--# to force copying
--import os
--try:
--    del os.link
--except AttributeError:
--    pass
--
--# This 'if' statement is needed to prevent spawning infinite processes
--# on Windows
--if __name__ == '__main__':
--    # BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
--    # update it when the contents of directories change.
--    if os.path.exists('MANIFEST'):
--        os.remove('MANIFEST')
--
- try:
-     from setuptools import setup
- except ImportError:
diff --git a/python-matplotlib-system-qhull.patch b/python-matplotlib-system-qhull.patch
new file mode 100644
index 0000000..0468039
--- /dev/null
+++ b/python-matplotlib-system-qhull.patch
@@ -0,0 +1,28 @@
+--- matplotlib-2.2.5/setupext.py.orig	2020-02-02 00:15:39.000000000 +0100
++++ matplotlib-2.2.5/setupext.py	2020-03-31 20:24:37.308082463 +0200
+@@ -234,6 +234,7 @@
+ 
+ lft = bool(os.environ.get('MPLLOCALFREETYPE', False))
+ options['local_freetype'] = lft or options.get('local_freetype', False)
++options['local_qhull'] = False
+ 
+ 
+ def get_win32_compiler():
+@@ -1410,8 +1411,7 @@
+     def check(self):
+         self.__class__.found_external = True
+         try:
+-            return self._check_for_pkg_config(
+-                'libqhull', 'libqhull/qhull_a.h', min_version='2015.2')
++            return not options.get('local_qhull', False)
+         except CheckFailed as e:
+             self.__class__.found_pkgconfig = False
+             self.__class__.found_external = False
+@@ -1419,6 +1419,7 @@
+ 
+     def add_flags(self, ext):
+         if self.found_external:
++            ext.libraries.append('qhull')
+             pkg_config.setup_extension(ext, 'qhull',
+                                        default_libraries=['qhull'])
+         else:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-matplotlib.git/commitdiff/17a0057e970d30ff12551b5acaa71c7008a90988

More information about the pld-cvs-commit mailing list