[arch-commits] Commit in python-matplotlib/trunk (3 files)

Felix Yan felixonmars at archlinux.org
Thu Jan 19 09:38:34 UTC 2017


    Date: Thursday, January 19, 2017 @ 09:38:34
  Author: felixonmars
Revision: 208016

upgpkg: python-matplotlib 2.0.0-1

Added:
  python-matplotlib/trunk/backports.functools_lru_cache.patch
Modified:
  python-matplotlib/trunk/PKGBUILD
  python-matplotlib/trunk/setup.cfg

-------------------------------------+
 PKGBUILD                            |   25 ++++++----
 backports.functools_lru_cache.patch |   83 ++++++++++++++++++++++++++++++++++
 setup.cfg                           |    5 --
 3 files changed, 100 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-19 09:32:13 UTC (rev 208015)
+++ PKGBUILD	2017-01-19 09:38:34 UTC (rev 208016)
@@ -7,8 +7,8 @@
 
 pkgbase=python-matplotlib
 pkgname=('python2-matplotlib' 'python-matplotlib')
-pkgver=1.5.3
-pkgrel=2
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="A python plotting library, making publication quality plots"
 arch=('i686' 'x86_64')
 url='http://matplotlib.org'
@@ -22,13 +22,18 @@
              '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' 'python-cycler' 'python2-cycler')
+             'python2-setuptools' 'python-cycler' 'python2-cycler' 'python2-backports.functools_lru_cache')
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz"
-        setup.cfg)
-sha512sums=('8b135a93d134646655f1defc0c1a58bee1488435b40643bb96d91724942395c71a41d0c9f77149097c233e3d9a9938d9e332dd21b62089e8932076380d74731b'
-            '493a08914755d7d27d98025fc309f19cc3ec45e777fc81a56fa50430f90c0b39c2f66c2a01f6fd14a2e351005151365a25d2ab71ae2e80a54c6f57ceeacea35b')
+        setup.cfg backports.functools_lru_cache.patch)
+sha512sums=('b0e6d91aee5f91e0155c9e6716eef1a7e1fb907daeb93d603709142b749878fd758e42fe3707ac73c3d87959c6a35126c9e17c08ef78c5734106fafdf198f304'
+            'f08c0b2e94599fdf2b736b8a655d862209934441d90f20ed872cfc128b8d2a6525763ab7cf64f2b3630e22a90798f4c52aa93b18087e9b48708d9bae34aada0b'
+            'bbb143d3da33f8c64fcd1aa4d8dfe3d311b48b7ae8ace20e3946a3ba82a5c08d0f51f4e08a57f00f1af4d529ea834e012e242bad1dba31e3fea9b64081613ff8')
 
 prepare() {
+   # Use a better backport
+   (cd matplotlib-$pkgver; patch -p1 -i ../backports.functools_lru_cache.patch)
+   sed -i '/Subprocess32/d' matplotlib-$pkgver/setup.py
+
    cp -a "$srcdir"/matplotlib-${pkgver}{,-py2}
 
    cd "$srcdir"/matplotlib-${pkgver}
@@ -46,9 +51,9 @@
    cp -a "$srcdir"/matplotlib-${pkgver}{,-test}
    cp -a "$srcdir"/matplotlib-${pkgver}-py2{,-test}
 
-   # Remove tests (FS#48175)
-   cp "$srcdir/setup.cfg" "$srcdir"/matplotlib-$pkgver/
-   cp "$srcdir/setup.cfg" "$srcdir"/matplotlib-$pkgver-py2/
+   # Configure tests (FS#48175)
+   cp "$srcdir/setup.cfg" "$srcdir"/matplotlib-$pkgver-test/
+   cp "$srcdir/setup.cfg" "$srcdir"/matplotlib-$pkgver-py2-test/
 }
 
 build() {
@@ -90,7 +95,7 @@
 }
 
 package_python2-matplotlib() {
-   depends=('python2-pytz' 'python2-numpy' 'python2-pyqt5' 'python2-dateutil' 'python2-pyparsing' 'python2-cycler' 'libxkbcommon-x11')
+   depends=('python2-pytz' 'python2-numpy' 'python2-pyqt5' 'python2-dateutil' 'python2-pyparsing' 'python2-cycler' 'libxkbcommon-x11' 'python2-backports.functools_lru_cache')
    optdepends=('pygtk: for GTK/GTKAgg/GTKCairo backend'
                'python2-cairo: for GTKCairo/GTK3Cairo backend'
                'python2-cairocffi: for GTKCairo/GTK3Cairo backend (alternative to python2-cairo)'

Added: backports.functools_lru_cache.patch
===================================================================
--- backports.functools_lru_cache.patch	                        (rev 0)
+++ backports.functools_lru_cache.patch	2017-01-19 09:38:34 UTC (rev 208016)
@@ -0,0 +1,83 @@
+commit bf9d9a931dd5e64ae92f5a5b2e8da8a9768a83ec
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Thu Jan 19 15:54:02 2017 +0800
+
+    Use backports.functools_lru_cache instead of functools32
+    
+    It's better maintained and more widely used (by pylint, jaraco, etc).
+
+diff --git a/INSTALL b/INSTALL
+index 0a935d585..5873ad258 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -222,7 +222,7 @@ Required Dependencies
+ Dependencies for python 2
+ ^^^^^^^^^^^^^^^^^^^^^^^^^
+ 
+-`functools32 <https://pypi.python.org/pypi/functools32>`_
++`backports.functools_lru_cache <https://pypi.python.org/pypi/backports.functools_lru_cache>`_
+     Required for compatibility if running on Python 2.7.
+ 
+ `subprocess32 <https://pypi.python.org/pypi/subprocess32/>`_
+diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
+index fc29500e0..581061f90 100644
+--- a/lib/matplotlib/font_manager.py
++++ b/lib/matplotlib/font_manager.py
+@@ -64,7 +64,7 @@ from matplotlib.fontconfig_pattern import (
+ try:
+     from functools import lru_cache
+ except ImportError:
+-    from functools32 import lru_cache
++    from backports.functools_lru_cache import lru_cache
+ 
+ 
+ USE_FONTCONFIG = False
+diff --git a/setup.py b/setup.py
+index fbcec3677..1bd79e687 100644
+--- a/setup.py
++++ b/setup.py
+@@ -69,7 +69,7 @@ mpl_packages = [
+     setupext.Numpy(),
+     setupext.Six(),
+     setupext.Dateutil(),
+-    setupext.FuncTools32(),
++    setupext.BackportsFuncToolsLRUCache(),
+     setupext.Subprocess32(),
+     setupext.Pytz(),
+     setupext.Cycler(),
+diff --git a/setupext.py b/setupext.py
+index 34ac8b384..e02cdde79 100644
+--- a/setupext.py
++++ b/setupext.py
+@@ -1523,25 +1523,25 @@ class Dateutil(SetupPackage):
+         return [dateutil]
+ 
+ 
+-class FuncTools32(SetupPackage):
+-    name = "functools32"
++class BackportsFuncToolsLRUCache(SetupPackage):
++    name = "backports.functools_lru_cache"
+ 
+     def check(self):
+         if not PY3min:
+             try:
+-                import functools32
++                import backports.functools_lru_cache
+             except ImportError:
+                 return (
+-                    "functools32 was not found. It is required for"
++                    "backports.functools_lru_cache was not found. It is required for"
+                     "Python versions prior to 3.2")
+ 
+-            return "using functools32"
++            return "using backports.functools_lru_cache"
+         else:
+             return "Not required"
+ 
+     def get_install_requires(self):
+         if not PY3min:
+-            return ['functools32']
++            return ['backports.functools_lru_cache']
+         else:
+             return []
+ 

Modified: setup.cfg
===================================================================
--- setup.cfg	2017-01-19 09:32:13 UTC (rev 208015)
+++ setup.cfg	2017-01-19 09:38:34 UTC (rev 208016)
@@ -1,4 +1,3 @@
 [packages]
-tests = False
-sample_data = False
-toolkits = True
+tests = True
+toolkits_tests = True



More information about the arch-commits mailing list