From 7cd93868323e4adf49b85aa5ec0a2808c710cc37 Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Sep 09 2021 07:22:19 +0000 Subject: Import python-matplotlib-3.4.2-1.el9 in CloudSIG xena --- diff --git a/.python-matplotlib.metadata b/.python-matplotlib.metadata index c2c7923..00efaab 100644 --- a/.python-matplotlib.metadata +++ b/.python-matplotlib.metadata @@ -1 +1,2 @@ -92ada4ef4e7374d67e46e30bfb08c3fed068d680 SOURCES/matplotlib-1.2.0-without-gpc.tar.gz +40886f7192dfc944d9d12980085e70241c8a2a85 SOURCES/matplotlib-3.4.2.tar.gz +09c397c82dca38164b4b3a9661d68226792fa4ed SOURCES/matplotlib-3.4.1-with-freetype-2.10.4.tar.gz diff --git a/SOURCES/0001-matplotlibrc-path-search-fix.patch b/SOURCES/0001-matplotlibrc-path-search-fix.patch new file mode 100644 index 0000000..5c44103 --- /dev/null +++ b/SOURCES/0001-matplotlibrc-path-search-fix.patch @@ -0,0 +1,43 @@ +From 92b11ded669267100e3c6858578351cad3749cd0 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Wed, 27 Sep 2017 19:35:59 -0400 +Subject: [PATCH 1/3] matplotlibrc path search fix + +Signed-off-by: Elliott Sales de Andrade +--- + lib/matplotlib/__init__.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py +index c3d4aaf62d..ec115cd3f5 100644 +--- a/lib/matplotlib/__init__.py ++++ b/lib/matplotlib/__init__.py +@@ -471,7 +471,8 @@ def get_cachedir(): + @_logged_cached('matplotlib data path: %s') + def get_data_path(): + """Return the path to Matplotlib data.""" +- return str(Path(__file__).with_name("mpl-data")) ++ return (Path(__file__).parent.parent.parent.parent.parent / ++ 'share/matplotlib/mpl-data') + + + def matplotlib_fname(): +@@ -491,6 +492,7 @@ def matplotlib_fname(): + is not defined) + - On other platforms, + - ``$HOME/.matplotlib/matplotlibrc`` if ``$HOME`` is defined ++ - ``/etc/matplotlibrc`` + - Lastly, it looks in ``$MATPLOTLIBDATA/matplotlibrc``, which should always + exist. + """ +@@ -509,6 +511,7 @@ def matplotlib_fname(): + yield matplotlibrc + yield os.path.join(matplotlibrc, 'matplotlibrc') + yield os.path.join(get_configdir(), 'matplotlibrc') ++ yield '/etc/matplotlibrc' + yield os.path.join(get_data_path(), 'matplotlibrc') + + for fname in gen_candidates(): +-- +2.29.2 + diff --git a/SOURCES/0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch b/SOURCES/0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch new file mode 100644 index 0000000..535e8ea --- /dev/null +++ b/SOURCES/0002-Set-FreeType-version-to-2.10.4-and-update-tolerances.patch @@ -0,0 +1,123 @@ +From c970ba953bed9df6670d28cb4421ebd054033590 Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Fri, 14 Feb 2020 06:05:42 -0500 +Subject: [PATCH 2/3] Set FreeType version to 2.10.4 and update tolerances. + +Signed-off-by: Elliott Sales de Andrade +--- + lib/matplotlib/__init__.py | 2 +- + lib/matplotlib/tests/test_axes.py | 4 ++-- + lib/matplotlib/tests/test_constrainedlayout.py | 2 +- + lib/matplotlib/tests/test_polar.py | 2 +- + lib/matplotlib/tests/test_tightlayout.py | 10 +++++----- + setupext.py | 6 +++++- + 6 files changed, 15 insertions(+), 11 deletions(-) + +diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py +index ec115cd3f5..47c315bde4 100644 +--- a/lib/matplotlib/__init__.py ++++ b/lib/matplotlib/__init__.py +@@ -1128,7 +1128,7 @@ default_test_modules = [ + def _init_tests(): + # The version of FreeType to install locally for running the + # tests. This must match the value in `setupext.py` +- LOCAL_FREETYPE_VERSION = '2.6.1' ++ LOCAL_FREETYPE_VERSION = '2.10.4' + + from matplotlib import ft2font + if (ft2font.__freetype_version__ != LOCAL_FREETYPE_VERSION or +diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py +index ed76af576f..f432713680 100644 +--- a/lib/matplotlib/tests/test_axes.py ++++ b/lib/matplotlib/tests/test_axes.py +@@ -6426,7 +6426,7 @@ def test_normal_axes(): + ] + for nn, b in enumerate(bbaxis): + targetbb = mtransforms.Bbox.from_bounds(*target[nn]) +- assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=2) ++ assert_array_almost_equal(b.bounds, targetbb.bounds, decimal=0) + + target = [ + [150.0, 119.999, 930.0, 11.111], +@@ -6444,7 +6444,7 @@ def test_normal_axes(): + + target = [85.5138, 75.88888, 1021.11, 1017.11] + targetbb = mtransforms.Bbox.from_bounds(*target) +- assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=2) ++ assert_array_almost_equal(bbtb.bounds, targetbb.bounds, decimal=0) + + # test that get_position roundtrips to get_window_extent + axbb = ax.get_position().transformed(fig.transFigure).bounds +diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py +index 67474628e7..d3e9d105dc 100644 +--- a/lib/matplotlib/tests/test_constrainedlayout.py ++++ b/lib/matplotlib/tests/test_constrainedlayout.py +@@ -429,7 +429,7 @@ def test_hidden_axes(): + extents1 = np.copy(axs[0, 0].get_position().extents) + + np.testing.assert_allclose( +- extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-5) ++ extents1, [0.045552, 0.543288, 0.47819, 0.982638], rtol=1e-2) + + + def test_colorbar_align(): +diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py +index 389d08b6ee..865780bf62 100644 +--- a/lib/matplotlib/tests/test_polar.py ++++ b/lib/matplotlib/tests/test_polar.py +@@ -312,7 +312,7 @@ def test_get_tightbbox_polar(): + fig.canvas.draw() + bb = ax.get_tightbbox(fig.canvas.get_renderer()) + assert_allclose( +- bb.extents, [107.7778, 29.2778, 539.7847, 450.7222], rtol=1e-03) ++ bb.extents, [107.7778, 29.2778, 539.7847, 450.7222], rtol=1) + + + @check_figures_equal(extensions=["png"]) +diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py +index 23d363b508..e94c863477 100644 +--- a/lib/matplotlib/tests/test_tightlayout.py ++++ b/lib/matplotlib/tests/test_tightlayout.py +@@ -172,12 +172,12 @@ def test_outward_ticks(): + plt.tight_layout() + # These values were obtained after visual checking that they correspond + # to a tight layouting that did take the ticks into account. +- ans = [[[0.091, 0.607], [0.433, 0.933]], +- [[0.579, 0.607], [0.922, 0.933]], +- [[0.091, 0.140], [0.433, 0.466]], +- [[0.579, 0.140], [0.922, 0.466]]] ++ ans = [[[0.09, 0.61], [0.43, 0.93]], ++ [[0.58, 0.61], [0.92, 0.93]], ++ [[0.09, 0.14], [0.43, 0.47]], ++ [[0.58, 0.14], [0.92, 0.47]]] + for nn, ax in enumerate(fig.axes): +- assert_array_equal(np.round(ax.get_position().get_points(), 3), ++ assert_array_equal(np.round(ax.get_position().get_points(), 2), + ans[nn]) + + +diff --git a/setupext.py b/setupext.py +index d8d0b6b393..aabb7ed9fd 100644 +--- a/setupext.py ++++ b/setupext.py +@@ -167,12 +167,16 @@ _freetype_hashes = { + '955e17244e9b38adb0c98df66abb50467312e6bb70eac07e49ce6bd1a20e809a', + '2.10.1': + '3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110', ++ '2.10.2': ++ 'e09aa914e4f7a5d723ac381420949c55c0b90b15744adce5d1406046022186ab', ++ '2.10.4': ++ '5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac', + } + # This is the version of FreeType to use when building a local + # version. It must match the value in + # lib/matplotlib.__init__.py and also needs to be changed below in the + # embedded windows build script (grep for "REMINDER" in this file) +-LOCAL_FREETYPE_VERSION = '2.6.1' ++LOCAL_FREETYPE_VERSION = '2.10.4' + LOCAL_FREETYPE_HASH = _freetype_hashes.get(LOCAL_FREETYPE_VERSION, 'unknown') + + LOCAL_QHULL_VERSION = '2020.2' +-- +2.29.2 + diff --git a/SOURCES/setup.cfg b/SOURCES/setup.cfg new file mode 100644 index 0000000..362e6ab --- /dev/null +++ b/SOURCES/setup.cfg @@ -0,0 +1,8 @@ +[libs] +system_freetype = True +system_qhull = True + +[packages] +tests = True +toolkits = True +toolkits_tests = True diff --git a/SPECS/python-matplotlib.spec b/SPECS/python-matplotlib.spec index bcfb04a..9ddf8dd 100644 --- a/SPECS/python-matplotlib.spec +++ b/SPECS/python-matplotlib.spec @@ -1,357 +1,805 @@ -%if 0%{?fedora} >= 18 -%global with_python3 1 -%global basepy3dir %(echo ../`basename %{py3dir}`) +%bcond_with html +%bcond_with check +# https://fedorahosted.org/fpc/ticket/381 +%bcond_without bundled_fonts + +# No qt4 for EL8/ELN/EL9 +%if 0%{?rhel} >= 8 +%bcond_with qt4 %else -%global with_python3 0 +%bcond_without qt4 %endif -%global __provides_exclude_from .*/site-packages/.*\\.so$ -%global with_html 0 -# On RHEL 7 onwards, don't build with wx: -%if 0%{?rhel} >= 7 -%global with_wx 0 +# No WX for EL8/ELN/EL9 +%if 0%{?rhel} >= 8 +%bcond_with wx %else -%global with_wx 1 +%bcond_without wx %endif +# the default backend; one of GTK3Agg GTK3Cairo MacOSX Qt4Agg Qt5Agg TkAgg +# WXAgg Agg Cairo PS PDF SVG +%global backend TkAgg + +%if "%{backend}" == "TkAgg" +%global backend_subpackage tk +%else +% if "%{backend}" == "Qt4Agg" +%global backend_subpackage qt4 +% else +% if "%{backend}" == "Qt5Agg" +%global backend_subpackage qt5 +% else +% if "%{backend}" == "WXAgg" +%global backend_subpackage wx +% endif +% endif +% endif +%endif + +# Use the same directory of the main package for subpackage licence and docs +%global _docdir_fmt %{name} + +# Updated test images for new FreeType. +%global mpl_images_version 3.4.1 + +# The version of FreeType in this Fedora branch. +%global ftver 2.10.4 Name: python-matplotlib -Version: 1.2.0 -Release: 16%{?dist} +Version: 3.4.2 +%global Version 3.4.2 +Release: 1%{?dist} Summary: Python 2D plotting library -Group: Development/Libraries -License: Python +# qt4_editor backend is MIT +# ResizeObserver at end of lib/matplotlib/backends/web_backend/js/mpl.js is Public Domain +License: Python and MIT and Public Domain URL: http://matplotlib.org -#Modified Sources to remove the one undistributable file -#See generate-tarball.sh in fedora cvs repository for logic -#sha1sum matplotlib-1.2.0-without-gpc.tar.gz -#92ada4ef4e7374d67e46e30bfb08c3fed068d680 matplotlib-1.2.0-without-gpc.tar.gz -Source0: matplotlib-%{version}-without-gpc.tar.gz - -Patch0: %{name}-noagg.patch -Patch1: %{name}-tk.patch -# http://sourceforge.net/mailarchive/message.php?msg_id=30202451 -# https://github.com/matplotlib/matplotlib/pull/1666 -# https://bugzilla.redhat.com/show_bug.cgi?id=896182 -Patch2: %{name}-fontconfig.patch - -# Upstream setup.py tries to detect if gtk is installed, but this -# requires an X server, and running the build under xvfb-run is -# fragile. -# -# Patch out these tests, and assume that the BuildRequires: gtk2-devel -# gives us what we need: -Patch3: disable-detection-of-gtk.patch - -BuildRequires: agg-devel +Source0: https://github.com/matplotlib/matplotlib/archive/v%{Version}/matplotlib-%{Version}.tar.gz +Source1: setup.cfg + +# Fedora-specific patches; see: +# https://github.com/fedora-python/matplotlib/tree/fedora-patches +# Updated test images for new FreeType. +Source1000: https://github.com/QuLogic/mpl-images/archive/v%{mpl_images_version}-with-freetype-%{ftver}/matplotlib-%{mpl_images_version}-with-freetype-%{ftver}.tar.gz +# Search in /etc/matplotlibrc: +Patch1001: 0001-matplotlibrc-path-search-fix.patch +# Increase tolerances for new FreeType everywhere: +Patch1002: 0002-Set-FreeType-version-to-%{ftver}-and-update-tolerances.patch + +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: glibc-langpack-en BuildRequires: freetype-devel -BuildRequires: gtk2-devel BuildRequires: libpng-devel -BuildRequires: numpy -BuildRequires: pycairo-devel -BuildRequires: pygtk2-devel -BuildRequires: pyparsing -BuildRequires: python-dateutil -BuildRequires: python2-devel -BuildRequires: pytz +BuildRequires: qhull-devel +BuildRequires: xorg-x11-server-Xvfb BuildRequires: zlib-devel -Requires: dejavu-sans-fonts -Requires: dvipng -Requires: numpy -Requires: pycairo -Requires: pygtk2 -Requires: pyparsing -Requires: python-dateutil -Requires: pytz -Requires: stix-fonts -Requires: stix-math-fonts - -%if 0%{?fedora} >= 18 -Requires: stix-math-fonts -%else -Requires: stix-fonts -%endif -%if 0%{?rhel} >= 7 -Requires: stix-math-fonts +BuildRequires: ghostscript +# No ImageMagick for EL8/ELN/EL9 +%if ! 0%{?rhel} >= 8 +BuildRequires: ImageMagick +%endif +%ifnarch s390x +BuildRequires: inkscape %endif -# PATCHES -Patch4: Make-font_manager-ignore-KeyErrors-for-bad-fonts.patch -Patch5: Skip-over-broken-TTF-font-when-creating-cache.patch -Patch6: Fix-for-Python-3.patch -Patch7: FIX-catch-ValueError-as-well.patch -Patch8: Remove-call-to-nonexistent-FT2Font.get_fontsize.patch +BuildRequires: texlive-collection-basic +BuildRequires: texlive-collection-fontsrecommended +BuildRequires: texlive-collection-latex +BuildRequires: texlive-collection-latexrecommended +BuildRequires: texlive-dvipng +BuildRequires: texlive-latex-bin +BuildRequires: texlive-luahbtex +BuildRequires: texlive-tex-bin +BuildRequires: texlive-xetex-bin +# Search for documentclass and add the classes here. +BuildRequires: tex(article.cls) +BuildRequires: tex(minimal.cls) +# Search for inputenc and add any encodings used with it. +BuildRequires: tex(utf8.def) +BuildRequires: tex(utf8x.def) +# Found with: rg -Io 'usepackage(\[.+\])?\{.+\}' lib | rg -o '\{.+\}' | sort -u +# and then removing duplicates in one line, etc. +BuildRequires: tex(avant.sty) +BuildRequires: tex(bm.sty) +BuildRequires: tex(chancery.sty) +BuildRequires: tex(charter.sty) +BuildRequires: tex(color.sty) +BuildRequires: tex(courier.sty) +BuildRequires: tex(euler.sty) +BuildRequires: tex(fancyhdr.sty) +BuildRequires: tex(fontenc.sty) +BuildRequires: tex(fontspec.sty) +BuildRequires: tex(geometry.sty) +BuildRequires: tex(graphicx.sty) +BuildRequires: tex(helvet.sty) +BuildRequires: tex(import.sty) +BuildRequires: tex(inputenc.sty) +BuildRequires: tex(mathpazo.sty) +BuildRequires: tex(mathptmx.sty) +BuildRequires: tex(pgf.sty) +BuildRequires: tex(preview.sty) +BuildRequires: tex(psfrag.sty) +#BuildRequires: tex(sfmath.sty) +BuildRequires: tex(textcomp.sty) +BuildRequires: tex(txfonts.sty) +BuildRequires: tex(type1cm.sty) +BuildRequires: tex(type1ec.sty) +BuildRequires: tex(unicode-math.sty) +# See BakomaFonts._fontmap in lib/matplotlib/mathtext.py +BuildRequires: tex(cmb10.tfm) +BuildRequires: tex(cmex10.tfm) +BuildRequires: tex(cmmi10.tfm) +BuildRequires: tex(cmr10.tfm) +BuildRequires: tex(cmss10.tfm) +BuildRequires: tex(cmsy10.tfm) +BuildRequires: tex(cmtt10.tfm) %description -Matplotlib is a python 2D plotting library which produces publication +Matplotlib is a Python 2D plotting library which produces publication quality figures in a variety of hardcopy formats and interactive -environments across platforms. matplotlib can be used in python -scripts, the python and ipython shell, web application servers, and -six graphical user interface toolkits. +environments across platforms. Matplotlib can be used in Python +scripts, the Python and IPython shell, web application servers, and +various graphical user interface toolkits. Matplotlib tries to make easy things easy and hard things possible. You can generate plots, histograms, power spectra, bar charts, errorcharts, scatterplots, etc, with just a few lines of code. -%package qt4 -Summary: Qt4 backend for python-matplotlib -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: PyQt4-devel -Requires: PyQt4 - -%description qt4 -%{summary} - -%package tk -Summary: Tk backend for python-matplotlib -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: tcl-devel -BuildRequires: tkinter -BuildRequires: tk-devel -Requires: tkinter +%package -n python3-matplotlib-data +Summary: Data used by python-matplotlib +BuildArch: noarch +%if %{with bundled_fonts} +Requires: python3-matplotlib-data-fonts = %{version}-%{release} +%endif +Obsoletes: python-matplotlib-data < 3 -%description tk +%description -n python3-matplotlib-data %{summary} -%if %{with_wx} -%package wx -Summary: wxPython backend for python-matplotlib -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -BuildRequires: wxPython-devel -Requires: wxPython - -%description wx +%if %{with bundled_fonts} +%package -n python3-matplotlib-data-fonts +Summary: Fonts used by python-matplotlib +# STIX and Computer Modern is OFL +# DejaVu is Bitstream Vera and Public Domain +License: OFL and Bitstream Vera and Public Domain +BuildArch: noarch +Requires: python3-matplotlib-data = %{version}-%{release} +Obsoletes: python-matplotlib-data-fonts < 3 + +%description -n python3-matplotlib-data-fonts %{summary} -%endif # with_wx - -%package doc -Summary: Documentation files for python-matplotlib -Group: Documentation -Requires: %{name}%{?_isa} = %{version}-%{release} -%if %{with_html} -BuildRequires: python-sphinx -BuildRequires: tex(latex) -BuildRequires: dvipng %endif -%description doc -%{summary} - -%if %{with_python3} %package -n python3-matplotlib Summary: Python 2D plotting library -Group: Development/Libraries BuildRequires: python3-cairo +BuildRequires: python3-certifi >= 2020.06.20 +BuildRequires: python3-cycler >= 0.10.0 BuildRequires: python3-dateutil BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: python3-gobject +BuildRequires: python3-kiwisolver BuildRequires: python3-numpy +BuildRequires: python3-pillow BuildRequires: python3-pyparsing BuildRequires: python3-pytz -BuildRequires: python3-six -Requires: python3-numpy +BuildRequires: python3-sphinx +Requires: dejavu-sans-fonts +Recommends: texlive-dvipng +Requires: (texlive-dvipng if texlive-base) +Requires: python3-matplotlib-data = %{version}-%{release} Requires: python3-cairo -Requires: python3-pyparsing +Requires: python3-cycler >= 0.10.0 Requires: python3-dateutil -Requires: python3-pytz -%if 0%{?fedora} >= 18 -Requires: stix-math-fonts +Requires: python3-kiwisolver +Requires: python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release} +%if %{with check} +BuildRequires: python3-pytest +BuildRequires: python3-pytest-rerunfailures +BuildRequires: python3-pytest-timeout +BuildRequires: python3-pytest-xdist +BuildRequires: python3-pikepdf +%endif +Requires: python3-numpy +Recommends: python3-pillow +Requires: python3-pyparsing +%if %{without bundled_fonts} +Requires: stix-math-fonts %else -Requires: stix-fonts +Provides: bundled(stix-math-fonts) %endif %description -n python3-matplotlib -Matplotlib is a python 2D plotting library which produces publication +Matplotlib is a Python 2D plotting library which produces publication quality figures in a variety of hardcopy formats and interactive -environments across platforms. matplotlib can be used in python -scripts, the python and ipython shell, web application servers, and -six graphical user interface toolkits. +environments across platforms. Matplotlib can be used in Python +scripts, the Python and IPython shell, web application servers, and +various graphical user interface toolkits. Matplotlib tries to make easy things easy and hard things possible. You can generate plots, histograms, power spectra, bar charts, errorcharts, scatterplots, etc, with just a few lines of code. +%if %{with qt4} %package -n python3-matplotlib-qt4 Summary: Qt4 backend for python3-matplotlib -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} BuildRequires: python3-PyQt4-devel +Requires: python3-matplotlib%{?_isa} = %{version}-%{release} +Requires: python3-matplotlib-qt5 Requires: python3-PyQt4 +# Upstream has deprecated this backend due to Qt4 being no longer supported. +# This backend will be removed when upstream does, likely in 3.5, or Fedora 35. +# The removal date is thus estimated to be the Fedora 35 Branch point. +Provides: deprecated() = 20210810 + %description -n python3-matplotlib-qt4 %{summary} +%endif + +%package -n python3-matplotlib-qt5 +Summary: Qt5 backend for python3-matplotlib +BuildRequires: python3-qt5 +Requires: python3-matplotlib%{?_isa} = %{version}-%{release} +Requires: python3-qt5 +%{?python_provide:%python_provide python3-matplotlib-qt5} + +%description -n python3-matplotlib-qt5 +%{summary} + +%package -n python3-matplotlib-gtk3 +Summary: GTK3 backend for python3-matplotlib +# This should be converted to typelib(Gtk) when supported +BuildRequires: gtk3 +BuildRequires: python3-gobject +Requires: gtk3%{?_isa} +Requires: python3-gobject%{?_isa} +Requires: python3-matplotlib%{?_isa} = %{version}-%{release} + +%description -n python3-matplotlib-gtk3 +%{summary} %package -n python3-matplotlib-tk Summary: Tk backend for python3-matplotlib -Group: Development/Libraries -Requires: python3-matplotlib%{?_isa} = %{version}-%{release} BuildRequires: python3-tkinter +Requires: python3-matplotlib%{?_isa} = %{version}-%{release} Requires: python3-tkinter %description -n python3-matplotlib-tk %{summary} + +%if %{with wx} +%package -n python3-matplotlib-wx +Summary: WX backend for python3-matplotlib +BuildRequires: python3-wxpython4 +Requires: python3-matplotlib%{?_isa} = %{version}-%{release} +Requires: python3-wxpython4 + +%description -n python3-matplotlib-wx +%{summary} %endif -%prep -%setup -q -n matplotlib-%{version} -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%package -n python3-matplotlib-doc +Summary: Documentation files for python-matplotlib +%if %{with html} +BuildRequires: graphviz +BuildRequires: python3-sphinx +BuildRequires: tex(latex) +BuildRequires: tex-preview +BuildRequires: js-jquery >= 3.2.1 +BuildRequires: xstatic-jquery-ui-common +Requires: js-jquery >= 3.2.1 +Requires: xstatic-jquery-ui-common +%endif +Requires: python3-matplotlib%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python3-matplotlib-doc} -# Remove bundled libraries -rm -r agg24 lib/matplotlib/pyparsing_py?.py +%description -n python3-matplotlib-doc +%{summary} -# Remove references to bundled libraries -%patch0 -p1 -b .noagg -sed -i -e s/matplotlib\.pyparsing_py./pyparsing/g lib/matplotlib/*.py +%package -n python3-matplotlib-test-data +Summary: Test data for python3-matplotlib +Requires: python3-matplotlib%{?_isa} = %{version}-%{release} -# Correct tcl/tk detection -%patch1 -p1 -b .tk -sed -i -e 's|@@libdir@@|%{_libdir}|' setupext.py +%description -n python3-matplotlib-test-data +%{summary} -# Use fontconfig by default -%patch2 -p1 -b .fontconfig -# Avoid the need for an X server during the build: -%patch3 -p1 +%prep +%autosetup -n matplotlib-%{Version} -N -chmod -x lib/matplotlib/mpl-data/images/*.svg +# Fedora-specific patches follow: +%patch1001 -p1 +# Updated test images for new FreeType. +%patch1002 -p1 +gzip -dc %SOURCE1000 | tar xf - --transform='s~^mpl-images-%{mpl_images_version}-with-freetype-%{ftver}/\([^/]\+\)/~lib/\1/tests/baseline_images/~' + +# Copy setup.cfg to the builddir +cp -p %{SOURCE1} setup.cfg -%if %{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif %build -%{__python2} setup.py build -%if %{with_html} +%set_build_flags +export http_proxy=http://127.0.0.1/ + +MPLCONFIGDIR=$PWD %py3_build +%if %{with html} # Need to make built matplotlib libs available for the sphinx extensions: pushd doc - export PYTHONPATH=`realpath ../build/lib.linux*` - %{__python2} make.py html + MPLCONFIGDIR=$PWD/.. \ + PYTHONPATH=`realpath ../build/lib.linux*` \ + %{python3} make.py html popd %endif # Ensure all example files are non-executable so that the -doc # package doesn't drag in dependencies find examples -name '*.py' -exec chmod a-x '{}' \; -%if %{with_python3} -pushd %{py3dir} - %{__python3} setup.py build - # documentation cannot be built with python3 due to syntax errors - # and building with python 2 exits with cryptic error messages -popd -%endif %install -%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT -chmod +x $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/dates.py -rm -rf $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/mpl-data/fonts - -%if %{with_python3} -pushd %{py3dir} - %{__python3} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT - chmod +x $RPM_BUILD_ROOT%{python3_sitearch}/matplotlib/dates.py - rm -rf $RPM_BUILD_ROOT%{python3_sitearch}/matplotlib/mpl-data/fonts - rm -f $RPM_BUILD_ROOT%{python3_sitearch}/six.py -popd +export http_proxy=http://127.0.0.1/ + +MPLCONFIGDIR=$PWD %py3_install + +# Delete unnecessary files. +rm %{buildroot}%{python3_sitearch}/matplotlib/backends/web_backend/.{eslintrc.js,prettierignore,prettierrc} +rm %{buildroot}%{python3_sitearch}/matplotlib/tests/tinypages/.gitignore +rm %{buildroot}%{python3_sitearch}/matplotlib/tests/tinypages/_static/.gitignore + +# Move files to Fedora-specific locations. +mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_datadir}/matplotlib +mv %{buildroot}%{python3_sitearch}/matplotlib/mpl-data \ + %{buildroot}%{_datadir}/matplotlib +%if %{without bundled_fonts} +rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts +%endif + + +%if %{with check} +%check +# These files confuse pytest, and we want to test the installed copy. +rm -rf build*/ + +# We need to prime this LaTeX cache stuff, or it might fail while running tests +# in parallel. +mktexfmt latex.fmt +mktexfmt lualatex.fmt +mktexfmt pdflatex.fmt +mktexfmt xelatex.fmt + +export http_proxy=http://127.0.0.1/ +# Skips: +# * test_invisible_Line_rendering: Checks for "slowness" that often fails on a +# heavily-loaded builder. +MPLCONFIGDIR=$PWD \ +PYTHONPATH=%{buildroot}%{python3_sitearch} \ +PYTHONDONTWRITEBYTECODE=1 \ + xvfb-run -a -s "-screen 0 640x480x24" \ + %{python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \ + -m 'not network' \ + -k 'not test_invisible_Line_rendering and not Qt5Agg' +# Run Qt5Agg tests separately to not conflict with Qt4 tests. +MPLCONFIGDIR=$PWD \ +PYTHONPATH=%{buildroot}%{python3_sitearch} \ +PYTHONDONTWRITEBYTECODE=1 \ + xvfb-run -a -s "-screen 0 640x480x24" \ + %{python3} tests.py -ra -n $(getconf _NPROCESSORS_ONLN) \ + -m 'not network' -k 'Qt5Agg' +%endif + + +%files -n python3-matplotlib-data +%{_datadir}/matplotlib/mpl-data/ +%if %{with bundled_fonts} +%exclude %{_datadir}/matplotlib/mpl-data/fonts/ %endif -%files -%doc README.txt -%doc lib/dateutil_py2/LICENSE -%doc lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX -%doc lib/pytz/LICENSE.txt -%doc CHANGELOG -%doc CXX -%doc INSTALL -%doc PKG-INFO -%doc TODO -%{python_sitearch}/*egg-info -%{python_sitearch}/matplotlib/ -%{python_sitearch}/mpl_toolkits/ -%{python_sitearch}/pylab.py* -%exclude %{python_sitearch}/matplotlib/backends/backend_qt4.* -%exclude %{python_sitearch}/matplotlib/backends/backend_qt4agg.* -%exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.* -%exclude %{python_sitearch}/matplotlib/backends/tkagg.* -%exclude %{python_sitearch}/matplotlib/backends/_tkagg.so -%exclude %{python_sitearch}/matplotlib/backends/backend_wx.* -%exclude %{python_sitearch}/matplotlib/backends/backend_wxagg.* - -%files qt4 -%{python_sitearch}/matplotlib/backends/backend_qt4.* -%{python_sitearch}/matplotlib/backends/backend_qt4agg.* - -%files tk -%{python_sitearch}/matplotlib/backends/backend_tkagg.py* -%{python_sitearch}/matplotlib/backends/tkagg.py* -%{python_sitearch}/matplotlib/backends/_tkagg.so - -%if %{with_wx} -%files wx -%{python_sitearch}/matplotlib/backends/backend_wx.* -%{python_sitearch}/matplotlib/backends/backend_wxagg.* -%endif # with_wx - -%files doc +%if %{with bundled_fonts} +%files -n python3-matplotlib-data-fonts +%{_datadir}/matplotlib/mpl-data/fonts/ +%endif + +%files -n python3-matplotlib-doc %doc examples -%if %{with_html} +%if %{with html} %doc doc/build/html/* %endif -%if %{with_python3} %files -n python3-matplotlib -%doc %{basepy3dir}/README.txt -%doc %{basepy3dir}/lib/dateutil_py3/LICENSE -%doc %{basepy3dir}/lib/matplotlib/mpl-data/fonts/ttf/LICENSE_STIX -%doc %{basepy3dir}/lib/pytz/LICENSE.txt -%doc %{basepy3dir}/CHANGELOG -%doc %{basepy3dir}/CXX -%doc %{basepy3dir}/INSTALL -%doc %{basepy3dir}/PKG-INFO -%doc %{basepy3dir}/TODO -%{python3_sitearch}/*egg-info +%license LICENSE/ +%doc README.rst +%{python3_sitearch}/matplotlib-*.egg-info/ +%{python3_sitearch}/matplotlib-*-nspkg.pth %{python3_sitearch}/matplotlib/ +%exclude %{python3_sitearch}/matplotlib/tests/baseline_images/* %{python3_sitearch}/mpl_toolkits/ -%{python3_sitearch}/pylab.py* -%{python3_sitearch}/__pycache__/* -%exclude %{python3_sitearch}/matplotlib/backends/backend_qt4.* -%exclude %{python3_sitearch}/matplotlib/backends/backend_qt4agg.* -%exclude %{python3_sitearch}/matplotlib/backends/backend_tkagg.* -%exclude %{python3_sitearch}/matplotlib/backends/backend_tkagg.* -%exclude %{python3_sitearch}/matplotlib/backends/tkagg.* +%exclude %{python3_sitearch}/mpl_toolkits/tests/baseline_images/* +%pycached %{python3_sitearch}/pylab.py +%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_qt4*.py +%if %{without qt4} +%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_qt5*.py +%endif +%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_gtk*.py +%pycached %exclude %{python3_sitearch}/matplotlib/backends/_backend_tk.py +%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_tk*.py %exclude %{python3_sitearch}/matplotlib/backends/_tkagg.* +%pycached %exclude %{python3_sitearch}/matplotlib/backends/backend_wx*.py +%exclude %{_pkgdocdir}/*/ + +%files -n python3-matplotlib-test-data +%{python3_sitearch}/matplotlib/tests/baseline_images/ +%{python3_sitearch}/mpl_toolkits/tests/baseline_images/ +%if %{with qt4} %files -n python3-matplotlib-qt4 -%{python_sitearch}/matplotlib/backends/backend_qt4.* -%{python_sitearch}/matplotlib/backends/backend_qt4agg.* +%pycached %{python3_sitearch}/matplotlib/backends/backend_qt4.py +%pycached %{python3_sitearch}/matplotlib/backends/backend_qt4agg.py +%endif + +# This subpackage is empty because the Qt4 backend imports it, so we leave +# these files in the default package, and only use this one for dependencies. +%files -n python3-matplotlib-qt5 +%if %{without qt4} +%pycached %{python3_sitearch}/matplotlib/backends/backend_qt5.py +%pycached %{python3_sitearch}/matplotlib/backends/backend_qt5agg.py +%endif + +%files -n python3-matplotlib-gtk3 +%pycached %{python3_sitearch}/matplotlib/backends/backend_gtk*.py %files -n python3-matplotlib-tk -%{python3_sitearch}/matplotlib/backends/backend_tkagg.py* -%{python3_sitearch}/matplotlib/backends/tkagg.* +%pycached %{python3_sitearch}/matplotlib/backends/backend_tk*.py +%pycached %{python3_sitearch}/matplotlib/backends/_backend_tk.py %{python3_sitearch}/matplotlib/backends/_tkagg.* + +%if %{with wx} +%files -n python3-matplotlib-wx +%pycached %{python3_sitearch}/matplotlib/backends/backend_wx*.py %endif + %changelog -* Mon Jan 21 2019 John Kacur - 1.2.0-16 -- Fix "unable to parse the pattern" message in stderr -Resolves: rhbz#1653300 +* Sat May 08 2021 Elliott Sales de Andrade - 3.4.2-1 +- Update to latest version (#1958461) + +* Wed Mar 31 2021 Elliott Sales de Andrade - 3.4.1-1 +- Update to latest version (#1943482) + +* Thu Mar 11 2021 Elliott Sales de Andrade - 3.4.0~rc3-1 +- Update to latest release candidate + +* Fri Feb 19 2021 Elliott Sales de Andrade - 3.4.0~rc1-1 +- Update to latest release candidate +- Deprecated python3-matplotlib-qt4 subpackage + +* Tue Feb 16 2021 Troy Dawson - 3.3.4-3 +- Add build deps that were only getting pulled in by other dependencies + +* Mon Feb 01 2021 Tomas Popela - 3.3.4-2 +- Conditionalize the WX backend and disable it on RHEL 8+ as WX is not + available there. + +* Thu Jan 28 2021 Elliott Sales de Andrade - 3.3.4-1 +- Update to latest version (#1921574) + +* Wed Jan 27 2021 Fedora Release Engineering - 3.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Dec 02 2020 Tomas Popela - 3.3.3-2 +- Don't build the Qt 4 backend in ELN/RHEL 9 as Qt 4 won't be available there + (reuse + https://src.fedoraproject.org/rpms/python-matplotlib/c/588e490738b06d525910f05bc1ba3f3f05ec7d50?branch=epel8) + +* Thu Nov 12 2020 Elliott Sales de Andrade - 3.3.3-1 +- Update to latest version (#1897021) + +* Tue Sep 15 2020 Elliott Sales de Andrade - 3.3.2-1 +- Update to latest version (#1878999) + +* Thu Aug 13 2020 Elliott Sales de Andrade - 3.3.1-1 +- Update to latest version +- Fixes RHBZ#1868838 + +* Wed Jul 29 2020 Fedora Release Engineering - 3.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 18 2020 Elliott Sales de Andrade - 3.3.0-1 +- Update to latest version +- Fixes RHBZ#1858120 + +* Tue Jun 30 2020 Elliott Sales de Andrade - 3.3.0-0.2.rc1 +- Add more test dependencies + +* Mon Jun 29 2020 Elliott Sales de Andrade - 3.3.0-0.1.rc1 +- Update to latest version + +* Sat Jun 20 2020 Elliott Sales de Andrade - 3.2.2-1 +- Update to latest version + +* Mon Jun 01 2020 Miro Hrončok - 3.2.1-2 +- Only recommend texlive-dvipng (but require it if texlive is installed) (#1509657) + +* Mon May 25 2020 Miro Hrončok - 3.2.1-1.1 +- Rebuilt for Python 3.9 + +* Wed Mar 18 2020 Elliott Sales de Andrade - 3.2.1-1 +- Update to latest version + +* Tue Mar 03 2020 Elliott Sales de Andrade - 3.2.0-1 +- Update to latest version + +* Thu Jan 30 2020 Fedora Release Engineering - 3.1.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Nov 22 2019 Elliott Sales de Andrade - 3.1.2-1 +- Update to latest version + +* Fri Sep 06 2019 Elliott Sales de Andrade - 3.1.1-2 +- Backport bool deprecation fix for Python 3.8 + +* Sun Aug 18 2019 Miro Hrončok - 3.1.1-1.1 +- Rebuilt for Python 3.8 + +* Thu Aug 08 2019 Elliott Sales de Andrade - 3.1.1-1 +- Update to latest version + +* Fri Jul 26 2019 Fedora Release Engineering - 3.0.3-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jul 3 2019 Zbigniew Jędrzejewski-Szmek - 3.0.3-2 +- Update Obsoletes to be later than the last python2 builds (#1726490) + +* Sat Mar 02 2019 Elliott Sales de Andrade - 3.0.3-1 +- Update to latest version + +* Sat Feb 02 2019 Fedora Release Engineering - 3.0.2-1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Nov 13 2018 Elliott Sales de Andrade - 3.0.2-1 +- Update to latest version + +* Wed Oct 31 2018 Elliott Sales de Andrade - 3.0.1-1 +- Update to latest version + +* Fri Sep 21 2018 Miro Hrončok - 3.0.0-2 +- Obsolete old python-matplotlib-data* to prevent conflicts and provide an upgrade path + +* Wed Sep 19 2018 Elliott Sales de Andrade - 3.0.0-1 +- Update to latest version +- Drop Python 2 subpackages +- Stop setting a default backend (allow Matplotlib to choose automatically) + +* Mon Aug 13 2018 Elliott Sales de Andrade - 2.2.3-1 +- Update to latest version + +* Fri Jul 20 2018 Elliott Sales de Andrade - 2.2.2-4 +- Don't use unversioned Python in build (#1605766) +- Add missing texlive-cm BR + +* Sat Jul 14 2018 Fedora Release Engineering - 2.2.2-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 2.2.2-3 +- Rebuilt for Python 3.7 + +* Tue Apr 17 2018 Elliott Sales de Andrade - 2.2.2-2 +- Remove bytecode produced by pytest +- Add python?-matplotlib-test-data subpackages + +* Sat Mar 31 2018 Elliott Sales de Andrade - 2.2.2-1 +- Update to latest release +- Run tests in parallel + +* Tue Mar 13 2018 Elliott Sales de Andrade - 2.1.2-3 +- Cleanup spec file of old conditionals +- Use more python2- dependencies + +* Mon Feb 05 2018 Karsten Hopp - 2.1.2-2 +- update and fix spec file conditionals + +* Sun Jan 21 2018 Elliott Sales de Andrade - 2.1.2-1 +- Update to latest release + +* Sun Dec 10 2017 Elliott Sales de Andrade - 2.1.1-1 +- Update to latest release + +* Mon Oct 16 2017 Elliott Sales de Andrade - 2.1.0-1 +- Update to latest release + +* Thu Sep 28 2017 Elliott Sales de Andrade - 2.0.2-1 +- Update to latest release + +* Thu Sep 28 2017 Elliott Sales de Andrade - 2.0.1-1 +- Update to latest release + +* Thu Aug 03 2017 Fedora Release Engineering - 2.0.0-3.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 2.0.0-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sun Mar 12 2017 Peter Robinson 2.0.0-3 +- Fix NVR + +* Mon Mar 06 2017 Thomas Spura - 2.0.0-2.2 +- Remove copyrighted file from tarball (gh-8034) + +* Sat Feb 11 2017 Fedora Release Engineering - 2.0.0-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jan 25 2017 Dan Horák - 2.0.0-2 +- Apply the 'aarch64' test tolerance patch on s390(x) also + +* Fri Jan 20 2017 Orion Poplawski - 2.0.0-1 +- Update to 2.0.0 final + +* Tue Jan 10 2017 Adam Williamson - 2.0.0-0.7.rc2 +- Update to 2.0.0rc2 +- Fix more big-endian integer issues +- Apply the 'aarch64' test tolerance patch on ppc64 also (it's affected by same issues) +- Tweak the 'i686' test tolerance patch a bit (some errors are gone, some new ones) +- Re-enable test suite for all arches +- Note a remaining quasi-random test issue that causes build to fail sometimes + +* Mon Jan 09 2017 Adam Williamson - 2.0.0-0.6.b4 +- Fix another integer type issue which caused more issues on ppc64 + +* Sun Jan 08 2017 Adam Williamson - 2.0.0-0.5.b4 +- Fix int type conversion error that broke text rendering on ppc64 (#1411070) + +* Tue Dec 13 2016 Charalampos Stratakis - 2.0.0-0.4.b4 +- Rebuild for Python 3.6 + +* Mon Oct 24 2016 Dan Horák - 2.0.0-0.3.b4 +- disable tests on some alt-arches to unblock depending builds + +* Mon Sep 26 2016 Dominik Mierzejewski - 2.0.0-0.2.b4 +- add missing runtime dependencies for python2 package + +* Sat Sep 10 2016 Dominik Mierzejewski - 2.0.0-0.1.b4 +- Update to 2.0.0b4 +- Drop upstreamed or obsolete patches +- python-cycler >= 0.10.0 is required +- move around Requires and BRs and sort more or less alphabetically +- don't ship baseline images for tests (like Debian) +- Require stix fonts only when they're not bundled +- disable HTML doc building for bootstrapping 2.0.x series +- relax image rendering tests tolerance due to freetype version differences +- disable some failing tests on aarch64 for now + +* Tue Jul 19 2016 Fedora Release Engineering - 1.5.2-0.2.rc2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Fri Jun 03 2016 Dominik Mierzejewski - 1.5.1-7 +- Update to 1.5.2rc2. +- Drop wrong hunk from use-system-six patch. +- Patch new qhull paths on F25+ instead of using sed. +- Rebase failing tests patch. + +* Mon May 23 2016 Dominik Mierzejewski - 1.5.1-6 +- Upstream no longer ships non-free images, use pristine source. + +* Wed May 18 2016 Dominik Mierzejewski - 1.5.1-5 +- Unbundle python-six (#1336740). +- Run tests (and temporarily disable failing ones). +- Use upstream-recommended way of running tests in parallel. +- python2-cycler and -mock are required for running tests. + +* Sat Apr 30 2016 Ralf Corsépius - 1.5.1-4 +- Rebuild for qhull-2015.2-1. +- Reflect qhull_a.h's location having changed. + +* Wed Apr 6 2016 Orion Poplawski - 1.5.1-3 +- Add requires python-cycler + +* Tue Apr 05 2016 Jon Ciesla - 1.5.1-2 +- Drop agg-devel BR, fix sphinx build with python*cycler BR + +* Mon Apr 04 2016 Thomas Spura - 1.5.1-1 +- update to 1.5.1 (#1276806) +- Add missing requires of dvipng to python3-matplotlib (#1270202) +- use bundled agg (#1276806) +- Drop cxx patch (was dropped upstream) +- Regenerate search path patch2 + +* Mon Apr 04 2016 Thomas Spura - 1.4.3-13 +- Require the qt5 subpackage from the qt4 subpackage (#1219556) + +* Thu Feb 04 2016 Fedora Release Engineering - 1.4.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jan 12 2016 Thomas Spura - 1.4.3-11 +- Fix another requires of the main package + +* Thu Jan 07 2016 Thomas Spura - 1.4.3-10 +- Fix requiring the correct backend from the main package + +* Thu Jan 07 2016 Thomas Spura - 1.4.3-9 +- regenerate tarball to exclude lena image (#1295174) + +* Sun Nov 15 2015 Thomas Spura - 1.4.3-8 +- Pick upstream patch for fixing the gdk backend #1231748 +- Add python2 subpackages and use python_provide + +* Tue Nov 10 2015 Fedora Release Engineering - 1.4.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Thu Jun 18 2015 Fedora Release Engineering - 1.4.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.4.3-5 +- Rebuilt for GCC 5 C++11 ABI change + +* Wed Feb 25 2015 Zbigniew Jędrzejewski-Szmek - 1.4.3-4 +- Split out python-matplotlib-gtk, python-matplotlib-gtk3, + python3-matplotlib-gtk3 subpackages (#1067373) +- Add missing requirements on gtk + +* Tue Feb 24 2015 Zbigniew Jędrzejewski-Szmek - 1.4.3-3 +- Use %%license, add skimage to build requirements + +* Tue Feb 17 2015 Elliott Sales de Andrade - 1.4.3-2 +- Disable Qt5 backend on Fedora <21 and RHEL + +* Tue Feb 17 2015 Elliott Sales de Andrade - 1.4.3-1 +- New upstream release (#1134007) +- Add Qt5 backend + +* Tue Jan 13 2015 Elliott Sales de Andrade - 1.4.2-1 +- Bump to new upstream release +- Add qhull-devel to BR +- Add six to Requires + +* Sun Aug 17 2014 Fedora Release Engineering - 1.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Jaroslav Škarvada - 1.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86 + +* Wed May 14 2014 Bohuslav Kabrda - 1.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 + +* Tue Feb 11 2014 pcpa - 1.3.1-3 +- Make TkAgg the default backend +- Remove python2 dependency from -data subpackage + +* Mon Jan 27 2014 pcpa - 1.3.1-2 +- Correct environment for and enable %%check +- Install system wide matplotlibrc under /etc +- Do not duplicate mpl-data for python2 and python3 packages +- Conditionally bundle data fonts (https://fedorahosted.org/fpc/ticket/381) + +* Sat Jan 25 2014 Thomas Spura - 1.3.1-1 +- update to 1.3.1 +- use GTKAgg as backend (#1030396, #982793, #1049624) +- use fontconfig +- add %%check for local testing (testing requires a display) + +* Wed Aug 7 2013 Thomas Spura - 1.3.0-1 +- update to new version +- use xz to compress sources +- drop fontconfig patch (upstream) +- drop tk patch (upstream solved build issue differently) +- redo use system agg patch +- delete bundled python-pycxx headers +- fix requires of python3-matplotlib-qt (fixes #988412) -* Fri Jan 24 2014 Daniel Mach - 1.2.0-15 -- Mass rebuild 2014-01-24 +* Sun Aug 04 2013 Fedora Release Engineering - 1.2.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Fri Dec 27 2013 Daniel Mach - 1.2.0-14 -- Mass rebuild 2013-12-27 +* Mon Jun 10 2013 Jon Ciesla - 1.2.0-14 +- agg rebuild. -* Thu Apr 11 2013 Bohuslav Kabrda - 1.2.0-13 -- Disable building under xvfb-run (#891533). +* Wed Apr 10 2013 Thomas Spura - 1.2.0-13 +- use python3 version in python3-matplotlib-qt4 (#915727) +- include __pycache__ files in correct subpackages on python3 * Wed Apr 3 2013 Thomas Spura - 1.2.0-12 - Decode output of subprocess to utf-8 or regex will fail (#928326) @@ -450,7 +898,7 @@ Resolves: rhbz#1653300 - fix build with new Tkinter which doesn't return an expected value in __version__ * Thu Sep 15 2011 Jef Spaleta - 1.0.1-13 -- apply upstream bugfix for timezone formatting (Bug 735677) +- apply upstream bugfix for timezone formatting (Bug 735677) * Fri May 20 2011 Orion Poplawski - 1.0.1-12 - Add Requires dvipng (Bug 684836) @@ -508,20 +956,20 @@ Resolves: rhbz#1653300 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild * Thu Jul 8 2010 Jef Spaleta - 1.0.0-1 -- New upstream release -- Remove undistributable file from bundled agg library +- New upstream release +- Remove undistributable file from bundled agg library * Thu Jul 1 2010 Jef Spaleta - 0.99.3-1 -- New upstream release +- New upstream release * Thu May 27 2010 Jef Spaleta - 0.99.1.2-4 -- Upstream patch to fix deprecated gtk tooltip warning. +- Upstream patch to fix deprecated gtk tooltip warning. * Mon Apr 12 2010 Jef Spaleta - 0.99.1.2-2 -- Bump to rebuild against numpy 1.3 +- Bump to rebuild against numpy 1.3 * Thu Apr 1 2010 Jef Spaleta - 0.99.1.2-1 -- Bump to rebuild against numpy 1.4.0 +- Bump to rebuild against numpy 1.4.0 * Fri Dec 11 2009 Jon Ciesla - 0.99.1.2 - Update to 0.99.1.2 @@ -582,7 +1030,7 @@ Resolves: rhbz#1653300 - Rebuild for Tcl/Tk downgrade * Sat Feb 10 2007 Jef Spaleta 0.90.0-2 -- Release bump for rebuild against new tk +- Release bump for rebuild against new tk * Fri Feb 09 2007 Orion Poplawski 0.90.0-1 - Update to 0.90.0 @@ -644,7 +1092,7 @@ Resolves: rhbz#1653300 - New upstream version 0.84 * Tue Aug 02 2005 Orion Poplawski 0.83.2-3 -- bump release +- bump release * Tue Aug 02 2005 Orion Poplawski 0.83.2-2 - Add Requires: python-numeric, pytz, python-dateutil