Accepting request 822342 from home:bnavigator:branches:devel:languages:python:numeric

Apparently MPL hard requires Pillow now: broke Staging:H without it (ipython)
Will remove explicit Pillow requirement in python-control, python-mplcursors

- Require Pillow
- Bump dependency versions

OBS-URL: https://build.opensuse.org/request/show/822342
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-matplotlib?expand=0&rev=35
This commit is contained in:
Tomáš Chvátal 2020-07-23 10:45:25 +00:00 committed by Git OBS Bridge
parent 47443e9f1a
commit 866b3b1f81
2 changed files with 13 additions and 7 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 23 09:49:30 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
- Require Pillow
- Bump dependency versions
-------------------------------------------------------------------
Mon Jul 20 21:10:29 UTC 2020 - Benjamin Greiner <code@bnavigator.de>

View File

@ -43,10 +43,10 @@ Source99: https://downloads.sourceforge.net/project/freetype/freetype2/2.6
Patch0: no-builddir-freetype.patch
BuildRequires: %{python_module Cycler >= 0.10}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module kiwisolver}
BuildRequires: %{python_module kiwisolver >= 1.0.1}
BuildRequires: %{python_module numpy >= 1.7.1}
BuildRequires: %{python_module numpy-devel >= 1.7.1}
BuildRequires: %{python_module pyparsing > 2.1.6}
BuildRequires: %{python_module pyparsing > 2.2.1}
BuildRequires: %{python_module pytz}
BuildRequires: %{python_module setuptools}
BuildRequires: c++_compiler
@ -55,15 +55,15 @@ BuildRequires: pkgconfig
BuildRequires: python-rpm-macros
BuildRequires: qhull-devel >= 2003.1
Requires: python-Cycler >= 0.10
Requires: python-Pillow >= 6.2
Requires: python-kiwisolver >= 1.0.1
Requires: python-numpy >= 1.7.1
Requires: python-pyparsing > 2.1.6
Requires: python-python-dateutil >= 2.1
Requires: python-pyparsing > 2.2.1
Requires: python-python-dateutil >= 2.7
Requires: python-pytz
Recommends: ghostscript
Recommends: libxml2-tools
Recommends: poppler-tools
Recommends: python-Pillow
Provides: python-matplotlib-gtk = %{version}
Obsoletes: python-matplotlib-gtk < %{version}
# SECTION WebAgg dependencies
@ -76,7 +76,7 @@ BuildRequires: pkgconfig(libpng) >= 1.2
BuildRequires: pkgconfig(tcl)
# /SECTION
%if %{with test}
BuildRequires: %{python_module Pillow}
BuildRequires: %{python_module Pillow >= 6.2}
BuildRequires: %{python_module matplotlib-cairo = %{version}}
BuildRequires: %{python_module matplotlib-gtk3 = %{version}}
BuildRequires: %{python_module matplotlib-qt5 = %{version}}
@ -87,7 +87,7 @@ BuildRequires: %{python_module matplotlib-wx = %{version}}
BuildRequires: %{python_module pytest-xdist}
BuildRequires: %{python_module pytest-xvfb}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module python-dateutil >= 2.1}
BuildRequires: %{python_module python-dateutil >= 2.7}
# SECTION cairo dependencies
BuildRequires: %{python_module cairo}
# /SECTION