[arch-commits] Commit in python-matplotlib/trunk (PKGBUILD fix-numpy-warning.patch)

[Felix Yan]

    Date: Friday, October 30, 2015 @ 08:18:27
  Author: fyan
Revision: 145284

upgpkg: python-matplotlib 1.5.0-1

Modified:
  python-matplotlib/trunk/PKGBUILD
Deleted:
  python-matplotlib/trunk/fix-numpy-warning.patch

-------------------------+
 PKGBUILD                |   20 ++++++++------------
 fix-numpy-warning.patch |   35 -----------------------------------
 2 files changed, 8 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-30 07:18:23 UTC (rev 145283)
+++ PKGBUILD	2015-10-30 07:18:27 UTC (rev 145284)
@@ -7,8 +7,8 @@
 
 pkgbase=python-matplotlib
 pkgname=('python2-matplotlib' 'python-matplotlib')
-pkgver=1.4.3
-pkgrel=4
+pkgver=1.5.0
+pkgrel=1
 pkgdesc="A python plotting library, making publication quality plots"
 arch=('i686' 'x86_64')
 url='http://matplotlib.org'
@@ -21,16 +21,12 @@
              'python2-pyparsing' 'pygtk' 'python-six' 'ghostscript' 'texlive-bin'
              'python-tornado' 'python2-tornado' 'gtk3' 'wxpython' 'python-pyqt5' 'python2-pyqt5'
              'libxkbcommon-x11' 'python-pillow' 'python2-pillow' 'python-setuptools'
-             'python2-setuptools')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz"
-        fix-numpy-warning.patch)
-sha512sums=('4aebbda31934bedbee5206b783e5cbe07db17367d50117a50bb80b7ea4aad987ec225958bed58885c561f00582c309d6e8c0a69861d3b4210a09b2d63975d2aa'
-            '5cfb8458c1b71f853cc1571fc0e4c8e3ebcf555f24a043a9b94f023e16dca8aa700339646783453918b0dc986de0f9d622f6e04ca785882ce189247b7f7a60b3')
+             'python2-setuptools' 'python-cycler' 'python2-cycler' 'pep8' 'python2-pep8'
+             'python-pandas' 'python2-pandas')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz")
+sha512sums=('4096515f70410e5c86f86497ae566793c751eca01ec3197e0b710e6097280b7e1617535fdb565c3fbcec6dd747be49d12295163716439a9936f8f091b6861c0c')
 
 prepare() {
-   # https://github.com/matplotlib/matplotlib/commit/5e8fb6213394ee27ea0d5ff6337ef6efd3e9c667
-   (cd matplotlib-${pkgver}; patch -p1 -i ../fix-numpy-warning.patch)
-
    cp -a matplotlib-${pkgver} matplotlib-${pkgver}-py2
 
    cd matplotlib-${pkgver}
@@ -79,7 +75,7 @@
 }
 
 package_python2-matplotlib() {
-   depends=('python2-pytz' 'python2-numpy' 'python2-pyqt5' 'python2-dateutil' 'python2-pyparsing' 'libxkbcommon-x11')
+   depends=('python2-pytz' 'python2-numpy' 'python2-pyqt5' 'python2-dateutil' 'python2-pyparsing' 'python2-cycler' 'libxkbcommon-x11')
    optdepends=('pygtk: for GTK/GTKAgg/GTKCairo backend'
                'python2-cairo: for GTKCairo/GTK3Cairo backend'
                'python2-cairocffi: for GTKCairo/GTK3Cairo backend (alternative to python2-cairo)'
@@ -100,7 +96,7 @@
 }
 
 package_python-matplotlib() {
-   depends=('python-pytz' 'python-numpy' 'python-pyqt5' 'python-dateutil' 'python-pyparsing' 'libxkbcommon-x11')
+   depends=('python-pytz' 'python-numpy' 'python-pyqt5' 'python-dateutil' 'python-pyparsing' 'python-cycler' 'libxkbcommon-x11')
    optdepends=('python-gobject: for GTK3Agg/GTK3Cairo backend'
                'python-cairocffi: for GTK3Agg/GTK3Cairo backend'
                'python-pyqt4: for Qt4Agg backend'

Deleted: fix-numpy-warning.patch
===================================================================
--- fix-numpy-warning.patch	2015-10-30 07:18:23 UTC (rev 145283)
+++ fix-numpy-warning.patch	2015-10-30 07:18:27 UTC (rev 145284)
@@ -1,35 +0,0 @@
-From 5e8fb6213394ee27ea0d5ff6337ef6efd3e9c667 Mon Sep 17 00:00:00 2001
-From: Jens Hedegaard Nielsen <jens.nielsen at ucl.ac.uk>
-Date: Sat, 15 Aug 2015 09:15:57 +0100
-Subject: [PATCH] Make sure _edgecolors is a string before comparison
-
-Fixes numpy deprecation warning. Comparing a numpy array to a string
-will return an array in future numpy versions
----
- lib/matplotlib/collections.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/lib/matplotlib/collections.py b/lib/matplotlib/collections.py
-index 6b87963..37393c6 100644
---- a/lib/matplotlib/collections.py
-+++ b/lib/matplotlib/collections.py
-@@ -617,7 +617,8 @@ def get_facecolor(self):
-     get_facecolors = get_facecolor
- 
-     def get_edgecolor(self):
--        if self._edgecolors == str('face'):
-+        if (isinstance(self._edgecolors, six.string_types)
-+                   and self._edgecolors == str('face')):
-             return self.get_facecolors()
-         else:
-             return self._edgecolors
-@@ -678,7 +679,8 @@ def set_alpha(self, alpha):
-         except (AttributeError, TypeError, IndexError):
-             pass
-         try:
--            if self._edgecolors_original != str('face'):
-+            if (not isinstance(self._edgecolors_original, six.string_types)
-+                             or self._edgecolors_original != str('face')):
-                 self._edgecolors = mcolors.colorConverter.to_rgba_array(
-                     self._edgecolors_original, self._alpha)
-         except (AttributeError, TypeError, IndexError):