[arch-commits] Commit in python2-matplotlib/repos/community-x86_64 (7 files)
Bruno Pagani
archange at archlinux.org
Wed Jan 16 23:21:10 UTC 2019
Date: Wednesday, January 16, 2019 @ 23:21:09
Author: archange
Revision: 423740
archrelease: copy trunk to community-x86_64
Added:
python2-matplotlib/repos/community-x86_64/PKGBUILD
(from rev 423739, python2-matplotlib/trunk/PKGBUILD)
python2-matplotlib/repos/community-x86_64/python2-matplotlib-13181.diff
(from rev 423739, python2-matplotlib/trunk/python2-matplotlib-13181.diff)
python2-matplotlib/repos/community-x86_64/python2-matplotlib.install
(from rev 423739, python2-matplotlib/trunk/python2-matplotlib.install)
python2-matplotlib/repos/community-x86_64/setup.cfg
(from rev 423739, python2-matplotlib/trunk/setup.cfg)
Deleted:
python2-matplotlib/repos/community-x86_64/PKGBUILD
python2-matplotlib/repos/community-x86_64/python2-matplotlib.install
python2-matplotlib/repos/community-x86_64/setup.cfg
-------------------------------+
PKGBUILD | 157 +++++++++++++++++++++-------------------
python2-matplotlib-13181.diff | 93 +++++++++++++++++++++++
python2-matplotlib.install | 32 ++++----
setup.cfg | 6 -
4 files changed, 195 insertions(+), 93 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-01-16 23:20:49 UTC (rev 423739)
+++ PKGBUILD 2019-01-16 23:21:09 UTC (rev 423740)
@@ -1,74 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
-
-pkgname=python2-matplotlib
-pkgver=2.2.3
-pkgrel=3
-pkgdesc="A python plotting library, making publication quality plots"
-arch=('x86_64')
-url="https://matplotlib.org"
-license=('custom')
-depends=('python2-numpy' 'python2-dateutil' 'python2-pyparsing' 'python2-pytz' 'libpng' 'freetype2'
- 'python2-cycler' 'python2-six' 'python2-backports.functools_lru_cache' 'python2-subprocess32' 'python2-kiwisolver')
-optdepends=('tk: Tk{Agg,Cairo} backends'
- 'python2-pyqt5: Qt5{Agg,Cairo} backends'
- 'pygtk: GTK{,Agg,Cairo} backends'
- 'python2-gobject: for GTK3{Agg,Cairo} backend'
- 'python2-wxpython3: WX{,Agg,Cairo} backend'
- 'python2-cairo: {GTK,GTK3,Qt5,Tk,WX}Cairo backends'
- 'python2-cairocffi: alternative for Cairo backends'
- 'python2-tornado: WebAgg backend'
- 'ffmpeg: for saving movies'
- 'imagemagick: for saving animated gifs'
- 'python2-pillow: for reading/saving jpeg/bmp/tiff files'
- 'ghostscript: usetex dependencies'
- 'texlive-bin: usetex dependencies')
-makedepends=('python2-setuptools'
- 'tk' 'python2-pyqt5' 'pygtk' 'python2-gobject'
- 'python2-wxpython3' 'python2-cairocffi' 'python2-tornado'
- 'python2-pillow' 'ghostscript' 'texlive-bin')
-checkdepends=('python2-pytest-xdist' 'python2-pytest-runner' 'xorg-server-xvfb'
- 'texlive-core' 'texlive-latexextra' 'inkscape' 'mencoder'
- 'ffmpeg' 'imagemagick' 'ttf-freefont' 'python2-pandas' 'python2-mock')
-install=$pkgname.install
-source=($pkgname-$pkgver.tar.gz::"https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz"
- setup.cfg)
-sha512sums=('d118f5d56e2f578031aba22933c0b3a4423a31a04f50f08cc1aa660186546d09692a9cf401bb5f24cb296f94fbfd8707460728d501ac2bd4a624dfa89e92949b'
- 'f08c0b2e94599fdf2b736b8a655d862209934441d90f20ed872cfc128b8d2a6525763ab7cf64f2b3630e22a90798f4c52aa93b18087e9b48708d9bae34aada0b')
-
-prepare() {
- cd matplotlib-$pkgver
- for file in $(find . -name '*.py' -print); do
- sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
- -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" $file
- done
- cd ..
-
- cp -a matplotlib-$pkgver{,-test}
-
- # Configure tests (FS#48175)
- cp setup.cfg matplotlib-$pkgver-test/
-}
-
-build() {
- cd matplotlib-$pkgver
- python2 setup.py build
-}
-
-check() {
- cd matplotlib-$pkgver-test
- xvfb-run -a -s "+extension GLX +extension RANDR +render -screen 0 1280x1024x24" \
- python2 setup.py pytest --addopts="-n auto" || warning "Tests failed" # Different font rendering details
-}
-
-package() {
- cd matplotlib-$pkgver
- python2 setup.py install --root "$pkgdir" --prefix=/usr --optimize=1 --skip-build
- # FS#41820 - unset default backend
- sed -i 's/backend : qt5agg/#backend : agg/' $pkgdir/usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc
- install -Dm644 doc/users/license.rst -t "$pkgdir"/usr/share/licenses/${pkgname}/
-}
Copied: python2-matplotlib/repos/community-x86_64/PKGBUILD (from rev 423739, python2-matplotlib/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-01-16 23:21:09 UTC (rev 423740)
@@ -0,0 +1,83 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+
+pkgname=python2-matplotlib
+pkgver=2.2.3
+pkgrel=4
+pkgdesc="A python plotting library, making publication quality plots"
+arch=('x86_64')
+url="https://matplotlib.org"
+license=('custom')
+depends=('python2-numpy' 'python2-dateutil' 'python2-pyparsing' 'python2-pytz' 'libpng' 'freetype2'
+ 'python2-cycler' 'python2-six' 'python2-backports.functools_lru_cache' 'python2-subprocess32' 'python2-kiwisolver')
+optdepends=('tk: Tk{Agg,Cairo} backends'
+ 'python2-pyqt5: Qt5{Agg,Cairo} backends'
+ 'pygtk: GTK{,Agg,Cairo} backends'
+ 'python2-gobject: for GTK3{Agg,Cairo} backend'
+ 'python2-wxpython3: WX{,Agg,Cairo} backend'
+ 'python2-cairo: {GTK,GTK3,Qt5,Tk,WX}Cairo backends'
+ 'python2-cairocffi: alternative for Cairo backends'
+ 'python2-tornado: WebAgg backend'
+ 'ffmpeg: for saving movies'
+ 'imagemagick: for saving animated gifs'
+ 'python2-pillow: for reading/saving jpeg/bmp/tiff files'
+ 'ghostscript: usetex dependencies'
+ 'texlive-bin: usetex dependencies')
+makedepends=('python2-setuptools'
+ 'tk' 'python2-pyqt5' 'pygtk' 'python2-gobject'
+ 'python2-wxpython3' 'python2-cairocffi' 'python2-tornado'
+ 'python2-pillow' 'ghostscript' 'texlive-bin')
+checkdepends=('python2-pytest-xdist' 'python2-pytest-runner' 'xorg-server-xvfb'
+ 'texlive-core' 'texlive-latexextra' 'inkscape' 'mencoder'
+ 'ffmpeg' 'imagemagick' 'ttf-freefont' 'python2-pandas' 'python2-mock')
+install=$pkgname.install
+source=($pkgname-$pkgver.tar.gz::"https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz"
+ $pkgname-numpy-asscalar.patch::"https://github.com/matplotlib/matplotlib/commit/62297d167c2b7ac8305ba6a60ec0191c6e7a09af.patch"
+ $pkgname-13181.diff
+ setup.cfg)
+sha512sums=('d118f5d56e2f578031aba22933c0b3a4423a31a04f50f08cc1aa660186546d09692a9cf401bb5f24cb296f94fbfd8707460728d501ac2bd4a624dfa89e92949b'
+ 'bb307885c17de71edf33dd09322aca99c2fade6dfbdf3482a7c11f2522fc40e2d41d8f51e77d2531de746906aabf3a68fa1bd8d76d48ea979c8010937713c0a9'
+ 'e63cd9b7a26de901815e3cdcc6a8e8f70e07bf9eed2befe4240747d245c96a4a44cc4b2fe876198b7bf055779c735d7571db2ca3904acdb1e4ddd288b3e24d2f'
+ 'f08c0b2e94599fdf2b736b8a655d862209934441d90f20ed872cfc128b8d2a6525763ab7cf64f2b3630e22a90798f4c52aa93b18087e9b48708d9bae34aada0b')
+
+prepare() {
+ cd matplotlib-$pkgver
+
+ patch -p1 -i ../$pkgname-numpy-asscalar.patch
+ patch -p1 -i ../$pkgname-13181.diff
+
+ for file in $(find . -name '*.py' -print); do
+ sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
+ -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" $file
+ done
+
+ cd ..
+
+ cp -a matplotlib-$pkgver{,-test}
+
+ # Configure tests (FS#48175)
+ cp setup.cfg matplotlib-$pkgver-test/
+}
+
+build() {
+ cd matplotlib-$pkgver
+ python2 setup.py build
+}
+
+check() {
+ cd matplotlib-$pkgver-test
+ xvfb-run -a -s "+extension GLX +extension RANDR +render -screen 0 1280x1024x24" \
+ python2 setup.py pytest --addopts="-n auto" || warning "Tests failed" # Different font rendering details
+}
+
+package() {
+ cd matplotlib-$pkgver
+ python2 setup.py install --root "$pkgdir" --prefix=/usr --optimize=1 --skip-build
+ # FS#41820 - unset default backend
+ sed -i 's/backend : qt5agg/#backend : agg/' $pkgdir/usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc
+ install -Dm644 doc/users/license.rst -t "$pkgdir"/usr/share/licenses/${pkgname}/
+}
Copied: python2-matplotlib/repos/community-x86_64/python2-matplotlib-13181.diff (from rev 423739, python2-matplotlib/trunk/python2-matplotlib-13181.diff)
===================================================================
--- python2-matplotlib-13181.diff (rev 0)
+++ python2-matplotlib-13181.diff 2019-01-16 23:21:09 UTC (rev 423740)
@@ -0,0 +1,93 @@
+diff --git a/lib/matplotlib/testing/conftest.py b/lib/matplotlib/testing/conftest.py
+index 9dc180c9600..fb306594780 100644
+--- a/lib/matplotlib/testing/conftest.py
++++ b/lib/matplotlib/testing/conftest.py
+@@ -24,19 +24,19 @@ def mpl_test_settings(request):
+ original_settings = matplotlib.rcParams.copy()
+
+ backend = None
+- backend_marker = request.keywords.get('backend')
++ backend_marker = request.node.get_closest_marker('backend')
+ if backend_marker is not None:
+ assert len(backend_marker.args) == 1, \
+ "Marker 'backend' must specify 1 backend."
+- backend = backend_marker.args[0]
++ backend, = backend_marker.args
+ prev_backend = matplotlib.get_backend()
+
+ style = '_classic_test' # Default of cleanup and image_comparison too.
+- style_marker = request.keywords.get('style')
++ style_marker = request.node.get_closest_marker('style')
+ if style_marker is not None:
+ assert len(style_marker.args) == 1, \
+ "Marker 'style' must specify 1 style."
+- style = style_marker.args[0]
++ style, = style_marker.args
+
+ matplotlib.testing.setup()
+ if backend is not None:
+@@ -64,7 +64,7 @@ def mpl_image_comparison_parameters(request, extension):
+ # pytest won't get confused.
+ # We annotate the decorated function with any parameters captured by this
+ # fixture so that they can be used by the wrapper in image_comparison.
+- baseline_images = request.keywords['baseline_images'].args[0]
++ baseline_images, = request.node.get_closest_marker('baseline_images').args
+ if baseline_images is None:
+ # Allow baseline image list to be produced on the fly based on current
+ # parametrization.
+diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py
+index 8bf6e7dde38..10d8033d4ca 100644
+--- a/lib/matplotlib/tests/test_backend_ps.py
++++ b/lib/matplotlib/tests/test_backend_ps.py
+@@ -31,13 +31,16 @@
+ @pytest.mark.flaky(reruns=3)
+ @pytest.mark.parametrize('format, use_log, rcParams', [
+ ('ps', False, {}),
+- needs_ghostscript(('ps', False, {'ps.usedistiller': 'ghostscript'})),
+- needs_usetex(needs_ghostscript(('ps', False, {'text.latex.unicode': True,
+- 'text.usetex': True}))),
++ pytest.param('ps', False, {'ps.usedistiller': 'ghostscript'},
++ marks=needs_ghostscript),
++ pytest.param('ps', False, {'text.latex.unicode': True,
++ 'text.usetex': True},
++ marks=[needs_ghostscript, needs_usetex]),
+ ('eps', False, {}),
+ ('eps', True, {'ps.useafm': True}),
+- needs_usetex(needs_ghostscript(('eps', False, {'text.latex.unicode': True,
+- 'text.usetex': True}))),
++ pytest.param('eps', False, {'text.latex.unicode': True,
++ 'text.usetex': True},
++ marks=[needs_ghostscript, needs_usetex]),
+ ], ids=[
+ 'ps',
+ 'ps with distiller',
+diff --git a/lib/matplotlib/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py
+index e0cbdfa8bce..1f6bf7cc3a6 100644
+--- a/lib/matplotlib/tests/test_backend_svg.py
++++ b/lib/matplotlib/tests/test_backend_svg.py
+@@ -130,7 +130,7 @@ def _test_determinism_save(filename, usetex):
+ "filename, usetex",
+ # unique filenames to allow for parallel testing
+ [("determinism_notex.svg", False),
+- needs_usetex(("determinism_tex.svg", True))])
++ pytest.param("determinism_tex.svg", True, marks=needs_usetex)])
+ def test_determinism(filename, usetex):
+ import sys
+ from subprocess import check_output, STDOUT, CalledProcessError
+diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
+index df7a5d08a10..8cd4585bffc 100644
+--- a/lib/matplotlib/tests/test_backends_interactive.py
++++ b/lib/matplotlib/tests/test_backends_interactive.py
+@@ -31,8 +31,10 @@ def _get_testable_interactive_backends():
+ reason = "No $DISPLAY"
+ elif any(importlib.util.find_spec(dep) is None for dep in deps):
+ reason = "Missing dependency"
+- backends.append(pytest.mark.skip(reason=reason)(backend) if reason
+- else backend)
++ if reason:
++ backend = pytest.param(
++ backend, marks=pytest.mark.skip(reason=reason))
++ backends.append(backend)
+ return backends
+
+
Deleted: python2-matplotlib.install
===================================================================
--- python2-matplotlib.install 2019-01-16 23:20:49 UTC (rev 423739)
+++ python2-matplotlib.install 2019-01-16 23:21:09 UTC (rev 423740)
@@ -1,16 +0,0 @@
-post_install() {
- cat << EOF
-
-Starting with python2-matplotlib 2.2.3-3, the Python 2.7 version of matplotlib
-now defaults to 'Agg' backend. This is a rendering only backend with no GUI.
-If you want to use a GUI backend, install the required optdepends and set the
-backend value in your matplotlibrc.
-
-EOF
-}
-
-post_upgrade() {
- if [ $(vercmp $2 2.2.3-3) -lt 0 ] ; then
- post_install
- fi
-}
Copied: python2-matplotlib/repos/community-x86_64/python2-matplotlib.install (from rev 423739, python2-matplotlib/trunk/python2-matplotlib.install)
===================================================================
--- python2-matplotlib.install (rev 0)
+++ python2-matplotlib.install 2019-01-16 23:21:09 UTC (rev 423740)
@@ -0,0 +1,16 @@
+post_install() {
+ cat << EOF
+
+Starting with python2-matplotlib 2.2.3-3, the Python 2.7 version of matplotlib
+now defaults to 'Agg' backend. This is a rendering only backend with no GUI.
+If you want to use a GUI backend, install the required optdepends and set the
+backend value in your matplotlibrc.
+
+EOF
+}
+
+post_upgrade() {
+ if [ $(vercmp $2 2.2.3-3) -lt 0 ] ; then
+ post_install
+ fi
+}
Deleted: setup.cfg
===================================================================
--- setup.cfg 2019-01-16 23:20:49 UTC (rev 423739)
+++ setup.cfg 2019-01-16 23:21:09 UTC (rev 423740)
@@ -1,3 +0,0 @@
-[packages]
-tests = True
-toolkits_tests = True
Copied: python2-matplotlib/repos/community-x86_64/setup.cfg (from rev 423739, python2-matplotlib/trunk/setup.cfg)
===================================================================
--- setup.cfg (rev 0)
+++ setup.cfg 2019-01-16 23:21:09 UTC (rev 423740)
@@ -0,0 +1,3 @@
+[packages]
+tests = True
+toolkits_tests = True
More information about the arch-commits
mailing list