rpm/python-matplotlib
SHA256
1
0
Fork 0
forked from pool/python-matplotlib
Code Pull Requests Activity

Accepting request 537215 from devel:languages:python

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/537215
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-matplotlib?expand=0&rev=56
This commit is contained in:
Dominique Leuenberger 2017-11-09 12:57:25 +00:00 committed by Git OBS Bridge
parent 0ae8b452de
commit d1a04dc29b
9 changed files with 60 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
0001-Allow-divmod-to-be-overridden-by-num.patch
View File

@ -1,23 +0,0 @@
From 4d26d74c69bea97dcd24986f95345da0b3591df9 Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Fri, 9 Jun 2017 17:55:37 +0100
Subject: [PATCH] Allow divmod to be overridden by numpy
---
lib/matplotlib/tests/test_basic.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/matplotlib/tests/test_basic.py b/lib/matplotlib/tests/test_basic.py
index 236e0d9e7d8..945e78322b3 100644
--- a/lib/matplotlib/tests/test_basic.py
+++ b/lib/matplotlib/tests/test_basic.py
@@ -20,7 +20,8 @@ def test_override_builtins():
'__spec__',
'any',
'all',
- 'sum'
+ 'sum',
+ 'divmod'
])
# We could use six.moves.builtins here, but that seems

49
0001-Fix-include-path-for-system-libqhull.patch
View File

@ -1,49 +0,0 @@
From e75ca533cc5a590d7831507794a2db25ca46e07e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=83=C2=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Thu, 13 Jul 2017 21:38:16 +0200
Subject: [PATCH] Fix include path for system libqhull
Current libqhull uses the libqhull subdirectory. If the system libqhull
is not found, it falls back to a much older bundled version.
---
setupext.py | 4 ++--
src/qhull_wrap.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/setupext.py b/setupext.py
index 3819636..8894b17 100644
--- a/setupext.py
+++ b/setupext.py
@@ -1175,14 +1175,14 @@ class Qhull(SetupPackage):
self.__class__.found_external = True
try:
return self._check_for_pkg_config(
- 'qhull', 'qhull/qhull_a.h', min_version='2003.1')
+ 'qhull', 'libqhull/qhull_a.h', min_version='2003.1')
except CheckFailed as e:
self.__class__.found_pkgconfig = False
# Qhull may not be in the pkg-config system but may still be
# present on this system, so check if the header files can be
# found.
include_dirs = [
- os.path.join(x, 'qhull') for x in get_include_dirs()]
+ os.path.join(x, 'libqhull') for x in get_include_dirs()]
if has_include_file(include_dirs, 'qhull_a.h'):
return 'Using system Qhull (version unknown, no pkg-config info)'
else:
diff --git a/src/qhull_wrap.c b/src/qhull_wrap.c
index 06d278e..7d6ace4 100644
--- a/src/qhull_wrap.c
+++ b/src/qhull_wrap.c
@@ -7,7 +7,7 @@
*/
#include "Python.h"
#include "numpy/noprefix.h"
-#include "qhull/qhull_a.h"
+#include <libqhull/qhull_a.h>
#include <stdio.h>
--
2.13.2

80
166a14473272_Fix-contour-colour-level-determination.patch
View File

@ -1,80 +0,0 @@
From 85896728ab6276da7b61f023acd7756cc73cf15d Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Fri, 9 Jun 2017 19:26:11 +0100
Subject: [PATCH 1/2] Fix contour colour level determination
---
lib/matplotlib/contour.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
index 82d9fb02331..5d3fc1126c0 100644
--- a/lib/matplotlib/contour.py
+++ b/lib/matplotlib/contour.py
@@ -1254,11 +1254,11 @@ def _process_colors(self):
i0, i1 = 0, len(self.levels)
if self.filled:
i1 -= 1
- # Out of range indices for over and under:
- if self.extend in ('both', 'min'):
- i0 = -1
- if self.extend in ('both', 'max'):
- i1 += 1
+ # Out of range indices for over and under:
+ if self.extend in ('both', 'min'):
+ i0 -= 1
+ if self.extend in ('both', 'max'):
+ i1 += 1
self.cvalues = list(range(i0, i1))
self.set_norm(colors.NoNorm())
else:
From 73e2c0ff996668951aa5b5035f43452b341b3712 Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Fri, 9 Jun 2017 19:27:07 +0100
Subject: [PATCH 2/2] Correct contour level test
---
.../contour_manual_colors_and_levels.png | Bin 28760 -> 28921 bytes
lib/matplotlib/tests/test_contour.py | 19 ++++++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/lib/matplotlib/tests/baseline_images/test_contour/contour_manual_colors_and_levels.png b/lib/matplotlib/tests/baseline_images/test_contour/contour_manual_colors_and_levels.png
[added as Source]
diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
index 5e2211066f3..eb2be0991ad 100644
--- a/lib/matplotlib/tests/test_contour.py
+++ b/lib/matplotlib/tests/test_contour.py
@@ -168,21 +168,22 @@ def test_given_colors_levels_and_extends():
levels = [2, 4, 8, 10]
for i, ax in enumerate(axes.flatten()):
- plt.sca(ax)
-
filled = i % 2 == 0.
extend = ['neither', 'min', 'max', 'both'][i // 2]
if filled:
- last_color = -1 if extend in ['min', 'max'] else None
- plt.contourf(data, colors=colors[:last_color], levels=levels,
- extend=extend)
+ # If filled, we have 3 colors with no extension,
+ # 4 colors with one extension, and 5 colors with both extensions
+ first_color = 1 if extend in ['max', 'neither'] else None
+ last_color = -1 if extend in ['min', 'neither'] else None
+ c = ax.contourf(data, colors=colors[first_color:last_color],
+ levels=levels, extend=extend)
else:
- last_level = -1 if extend == 'both' else None
- plt.contour(data, colors=colors, levels=levels[:last_level],
- extend=extend)
+ # If not filled, we have 4 levels and 4 colors
+ c = ax.contour(data, colors=colors[:-1],
+ levels=levels, extend=extend)
- plt.colorbar()
+ plt.colorbar(c, ax=ax)
@image_comparison(baseline_images=['contour_datetime_axis'],

3
166a14473272_contour_manual_colors_and_levels.png
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:10b9ed83739505554a74a33ac0665bcf7fb87e35eab9f1155bd98ceacf061518
size 28921

70
97e170d2fc2c_Pass-integers-to-np_linspace.patch
View File

@ -1,70 +0,0 @@
From 97e170d2fc2c2e8771148ea031bf39cdce3a014d Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 7 Dec 2016 00:14:07 -0500
Subject: [PATCH] Pass integers to np.linspace/np.logspace's count.
This fixes "DeprecationWarning: object of type <class 'float'> cannot
be safely interpreted as an integer." raised by latest NumPy.
---
examples/api/custom_projection_example.py | 4 ++--
lib/matplotlib/projections/geo.py | 4 ++--
lib/matplotlib/tests/test_path.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/api/custom_projection_example.py b/examples/api/custom_projection_example.py
index 7dc0ca2b1e4..b8c13eff733 100644
--- a/examples/api/custom_projection_example.py
+++ b/examples/api/custom_projection_example.py
@@ -298,7 +298,7 @@ def set_longitude_grid(self, degrees):
class -- it provides a more convenient interface to set the
ticking than set_xticks would.
"""
- number = (360.0 / degrees) + 1
+ number = int(360 / degrees) + 1
self.xaxis.set_major_locator(
FixedLocator(
np.linspace(-np.pi, np.pi, number, True)[1:-1]))
@@ -312,7 +312,7 @@ def set_latitude_grid(self, degrees):
class -- it provides a more convenient interface than
set_yticks would.
"""
- number = (180.0 / degrees) + 1
+ number = int(180 / degrees) + 1
self.yaxis.set_major_locator(
FixedLocator(
np.linspace(-np.pi / 2.0, np.pi / 2.0, number, True)[1:-1]))
diff --git a/lib/matplotlib/projections/geo.py b/lib/matplotlib/projections/geo.py
index a428b1380cb..e834f008795 100644
--- a/lib/matplotlib/projections/geo.py
+++ b/lib/matplotlib/projections/geo.py
@@ -190,7 +190,7 @@ def set_longitude_grid(self, degrees):
"""
Set the number of degrees between each longitude grid.
"""
- number = (360.0 / degrees) + 1
+ number = int(360 / degrees) + 1
self.xaxis.set_major_locator(
FixedLocator(
np.linspace(-np.pi, np.pi, number, True)[1:-1]))
@@ -201,7 +201,7 @@ def set_latitude_grid(self, degrees):
"""
Set the number of degrees between each longitude grid.
"""
- number = (180.0 / degrees) + 1
+ number = int(180 / degrees) + 1
self.yaxis.set_major_locator(
FixedLocator(
np.linspace(-np.pi / 2.0, np.pi / 2.0, number, True)[1:-1]))
diff --git a/lib/matplotlib/tests/test_path.py b/lib/matplotlib/tests/test_path.py
index c29289ae81f..71fcb7c89bc 100644
--- a/lib/matplotlib/tests/test_path.py
+++ b/lib/matplotlib/tests/test_path.py
@@ -97,7 +97,7 @@ def test_make_compound_path_empty():
def test_xkcd():
np.random.seed(0)
- x = np.linspace(0, 2.0 * np.pi, 100.0)
+ x = np.linspace(0, 2 * np.pi, 100)
y = np.sin(x)
with plt.xkcd():

3
matplotlib-2.0.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1
size 53879938

3
matplotlib-2.1.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b5f16c9cefde553ea79975305dcaa67c8e13d927b6e55aa14b4a8d867e25387
size 35727251

52
python-matplotlib.changes
View File

@ -1,3 +1,55 @@
-------------------------------------------------------------------
Thu Oct 26 17:37:41 UTC 2017 - toddrme2178@gmail.com
- Update to version 2.1.0
+ New features
* String categorical values
* Interactive JS widgets for animation
* Enhancements to polar plot
* Figure class now has subplots method
* Metadata savefig keyword argument
* Busy Cursor
* PolygonSelector
* Added matplotlib.ticker.PercentFormatter
* Reproducible PS, PDF and SVG output
* Orthographic projection for mplot3d
* voxels function for mplot3d
+ Improvements
* Add capstyle and joinstyle attributes to Collection
* CheckButtons widget get_status function
* Add fill_bar argument to AnchoredSizeBar
* Annotation can use a default arrow style
* Barbs and Quiver Support Dates
* Hexbin default line color
* Figure.legend() can be called without arguments
* Multiple legend keys for legend entries
* New parameter clear for :func:`~matplotlib.pyplot.figure`
* Specify minimum value to format as scalar for LogFormatterMathtext
* New quiverkey angle keyword argument
* Colormap reversed method
* Artist.setp (and pyplot.setp) accept a file argument
* streamplot streamline generation more configurable
* Axis.set_tick_params now responds to rotation
* Shading in 3D bar plots
* New which Parameter for autofmt_xdate
* New Figure Parameter for subplot2grid
* Interpolation in fill_betweenx
* New keyword argument sep for EngFormatter
* Extend MATPLOTLIBRC behavior
* density kwarg to hist
+ Internals
* New TransformedPatchPath caching object
* Abstract base class for movie writers
* Stricter validation of line style rcParams
+ Performance
* Path simplification updates
* Implement intersects_bbox in c++\
- Remove upstream-included patches:
* 0001-Fix-include-path-for-system-libqhull.patch
* 0001-Allow-divmod-to-be-overridden-by-num.patch
* 166a14473272_Fix-contour-colour-level-determination.patch
* 97e170d2fc2c_Pass-integers-to-np_linspace.patch
-------------------------------------------------------------------
Mon Oct 9 22:33:02 UTC 2017 - stefan.bruens@rwth-aachen.de

31
python-matplotlib.spec
View File

@ -23,7 +23,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define oldpython python
Name: python-matplotlib
Version: 2.0.2
Version: 2.1.0
Release: 0
Summary: Plotting Library for Python
License: SUSE-Matplotlib
@ -31,16 +31,6 @@ Group: Development/Libraries/Python
Url: http://matplotlib.org
Source: https://files.pythonhosted.org/packages/source/m/matplotlib/matplotlib-%{version}.tar.gz
Source1: matplotlib-setup.cfg
Source2: 166a14473272_contour_manual_colors_and_levels.png
# PATCH-FIX-OPENSUSE 0001-Fix-include-path-for-system-libqhull.patch stefan.bruens@rwth-aachen.de -- avoid using bundled qhull, fixed in mpl 2.1.0
Patch0: 0001-Fix-include-path-for-system-libqhull.patch
# PATCH-FIX-UPSTREAM 0001-Allow-divmod-to-be-overridden-by-num.patch stefan.bruens@rwth-aachen.de -- fix testcase https://github.com/matplotlib/matplotlib/pull/8735.patch
Patch1: 0001-Allow-divmod-to-be-overridden-by-num.patch
# PATCH-FIX-UPSTREAM 166a14473272_Fix-contour-colour-level-determination.patch stefan.bruens@rwth-aachne.de - fix countours https://github.com/matplotlib/matplotlib/commit/166a14473272.patch
Patch2: 166a14473272_Fix-contour-colour-level-determination.patch
# PATCH-FIX-UPSTREAM 97e170d2fc2c_Pass-integers-to-np_linspace.patch stefan.bruens@rwth-aachne.de - fix geo projections https://github.com/matplotlib/matplotlib/commit/97e170d2fc2c.patch
Patch3: 97e170d2fc2c_Pass-integers-to-np_linspace.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: c++_compiler
BuildRequires: fdupes
BuildRequires: pkg-config
@ -245,10 +235,6 @@ for %{name} plotting package
%prep
%setup -q -n matplotlib-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
chmod -x lib/matplotlib/mpl-data/images/*.svg
find examples lib/matplotlib lib/mpl_toolkits/mplot3d -type f -name "*.py" -exec sed -i "s|#!\/usr\/bin\/env python||" {} \;
find examples lib/matplotlib lib/mpl_toolkits/mplot3d -type f -name "*.py" -exec sed -i "s|#!\/usr\/bin\/python||" {} \;
@ -257,7 +243,6 @@ cp %{SOURCE1} ./setup.cfg
%if %{without tests}
sed -i -e 's/tests = .*/tests = False/' ./setup.cfg
%else
cp %{SOURCE2} lib/matplotlib/tests/baseline_images/test_contour/contour_manual_colors_and_levels.png
# raise tolerance for changes due to freetype 2.6/2.7 rendering differences
sed -i -e 's/\(image_comparison.*\)tol=0/\1tol=0.310/' lib/matplotlib/testing/decorators.py # default
sed -i -e 's/tol=0.002/tol=0.009/' lib/matplotlib/tests/test_streamplot.py
@ -289,7 +274,9 @@ trap "kill $! || true" EXIT
%files %{python_files}
%defattr(-,root,root,-)
%doc README.rst LICENSE CHANGELOG PKG-INFO examples doc/users/license.rst
%doc README.rst PKG-INFO doc/users/license.rst
%doc examples/
%doc LICENSE/
%{python_sitearch}/matplotlib/
%{python_sitearch}/matplotlib-%{version}-py*.egg-info
%{python_sitearch}/matplotlib-%{version}-py*-nspkg.pth
@ -310,12 +297,9 @@ trap "kill $! || true" EXIT
%exclude %{python_sitearch}/matplotlib/backends/backend_webagg_core.*
%exclude %{python_sitearch}/matplotlib/backends/qt_compat.*
%exclude %{python_sitearch}/matplotlib/backends/qt_editor/
%exclude %{python_sitearch}/matplotlib/backends/qt4_compat.*
%exclude %{python_sitearch}/matplotlib/backends/tkagg.*
%exclude %{python_sitearch}/matplotlib/backends/web_backend/
%endif
%ifpycache
%if 0%{?is_opensuse}
%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_cairo.*
%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3.*
%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_gtk3agg.*
@ -328,12 +312,9 @@ trap "kill $! || true" EXIT
%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_webagg.*
%exclude %{python_sitearch}/matplotlib/backends/__pycache__/backend_webagg_core.*
%exclude %{python_sitearch}/matplotlib/backends/__pycache__/qt_compat.*
%exclude %{python_sitearch}/matplotlib/backends/__pycache__/qt4_compat.*
%exclude %{python_sitearch}/matplotlib/backends/__pycache__/tkagg.*
%endif
%endif
%ifpython2
%if 0%{?is_opensuse}
%exclude %{python_sitearch}/matplotlib/backends/backend_wx.py*
%exclude %{python_sitearch}/matplotlib/backends/backend_wxagg.py*
%exclude %{python_sitearch}/matplotlib/backends/wx_compat.py*
@ -343,7 +324,7 @@ trap "kill $! || true" EXIT
# Dummy package to pull in latex dependencies.
%files %{python_files latex}
%defattr(-,root,root,-)
%doc doc/users/usetex.rst
%doc README.rst
%if 0%{?is_opensuse}
@ -370,12 +351,10 @@ trap "kill $! || true" EXIT
%defattr(-,root,root,-)
%{python_sitearch}/matplotlib/backends/backend_qt5.py*
%{python_sitearch}/matplotlib/backends/backend_qt5agg.py*
%{python_sitearch}/matplotlib/backends/qt4_compat.py*
%{python_sitearch}/matplotlib/backends/qt_compat.py*
%{python_sitearch}/matplotlib/backends/qt_editor/
%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt5.*.py*
%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/backend_qt5agg.*.py*
%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/qt4_compat.*.py*
%pycache_only %{python_sitearch}/matplotlib/backends/__pycache__/qt_compat.*.py*
%files %{python_files qt4}