mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-14 02:53:50 +02:00
python-matplotlib: update to 1.5.0
This commit is contained in:
parent
8fc5c51cd0
commit
aa6b6fda19
2 changed files with 13 additions and 19 deletions
|
@ -2,13 +2,13 @@ Description: Fixes the path to search for matplotlibrc file
|
||||||
Forwarded: not-needed
|
Forwarded: not-needed
|
||||||
Author: Sandro Tosi <morph@debian.org>
|
Author: Sandro Tosi <morph@debian.org>
|
||||||
|
|
||||||
--- lib/matplotlib/__init__.py
|
--- ./lib/matplotlib/__init__.py
|
||||||
+++ lib/matplotlib/__init__.py
|
+++ ./lib/matplotlib/__init__.py
|
||||||
@@ -653,10 +653,12 @@ def _get_data_path():
|
@@ -681,10 +681,12 @@ def _get_data_path():
|
||||||
raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
|
|
||||||
return path
|
return path
|
||||||
|
|
||||||
- path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
|
_file = _decode_filesystem_path(__file__)
|
||||||
|
- path = os.sep.join([os.path.dirname(_file), 'mpl-data'])
|
||||||
+ path = '/usr/share/matplotlib/mpl-data'
|
+ path = '/usr/share/matplotlib/mpl-data'
|
||||||
if os.path.isdir(path):
|
if os.path.isdir(path):
|
||||||
return path
|
return path
|
||||||
|
@ -18,7 +18,7 @@ Author: Sandro Tosi <morph@debian.org>
|
||||||
# setuptools' namespace_packages may highjack this init file
|
# setuptools' namespace_packages may highjack this init file
|
||||||
# so need to try something known to be in matplotlib, not basemap
|
# so need to try something known to be in matplotlib, not basemap
|
||||||
import matplotlib.afm
|
import matplotlib.afm
|
||||||
@@ -777,7 +779,7 @@ def matplotlib_fname():
|
@@ -812,7 +814,7 @@ def matplotlib_fname():
|
||||||
home, '.matplotlib', 'matplotlibrc')
|
home, '.matplotlib', 'matplotlibrc')
|
||||||
return fname
|
return fname
|
||||||
|
|
||||||
|
|
|
@ -1,32 +1,29 @@
|
||||||
# Template file for 'python-matplotlib'
|
# Template file for 'python-matplotlib'
|
||||||
pkgname=python-matplotlib
|
pkgname=python-matplotlib
|
||||||
version=1.4.3
|
version=1.5.0
|
||||||
revision=3
|
revision=1
|
||||||
wrksrc="matplotlib-${version}"
|
wrksrc="matplotlib-${version}"
|
||||||
build_style=python-module
|
build_style=python-module
|
||||||
python_versions="2.7 3.4"
|
python_versions="2.7 3.4"
|
||||||
hostmakedepends="pkg-config python-setuptools python3.4-setuptools"
|
hostmakedepends="pkg-config python-setuptools python3.4-setuptools"
|
||||||
# XXX: use internal copy of agg and pycxx, highly patched
|
# XXX: use internal copy of agg, highly patched
|
||||||
makedepends="
|
makedepends="
|
||||||
python-devel python3.4-devel python-numpy python3.4-numpy
|
python-devel python3.4-devel python-numpy python3.4-numpy
|
||||||
python-six python3.4-six python-dateutil python3.4-dateutil python-pytz
|
python-cycler python3.4-cycler python-dateutil python3.4-dateutil python-pytz
|
||||||
python3.4-pytz python-tornado python3.4-tornado python-parsing
|
python3.4-pytz python-tornado python3.4-tornado python-parsing
|
||||||
python3.4-parsing python-PyQt4-devel python-PyQt5-devel python-pyside
|
python3.4-parsing python-PyQt4-devel python-PyQt5-devel python-pyside
|
||||||
python3.4-pyside python-cairocffi python3.4-cairocffi python-gobject-devel
|
python3.4-pyside python-cairocffi python3.4-cairocffi python-gobject-devel
|
||||||
pygtk-devel gtk+3-devel tk-devel python-tkinter python3.4-tkinter wxPython-devel
|
pygtk-devel gtk+3-devel tk-devel python-tkinter python3.4-tkinter wxPython-devel
|
||||||
freetype-devel libpng-devel libqhull-devel"
|
freetype-devel libpng-devel libqhull-devel"
|
||||||
depends="python-matplotlib-data>=${version}_${revision} python-numpy python-six
|
depends="python-matplotlib-data>=${version}_${revision} python-numpy python-cycler
|
||||||
python-dateutil python-parsing python-pytz"
|
python-dateutil python-parsing python-pytz"
|
||||||
replaces="python-matplotlib-cairo>=0 python-matplotlib-gtk>=0 python-matplotlib-gtk3>=0
|
|
||||||
python-matplotlib-qtshared>=0 python-matplotlib-qt4>=0 python-matplotlib-qt5>=0
|
|
||||||
python-matplotlib-tk>=0 python-matplotlib-web>=0 python-matplotlib-wx>=0"
|
|
||||||
pycompile_module="matplotlib mpl_toolkits pylab.py"
|
pycompile_module="matplotlib mpl_toolkits pylab.py"
|
||||||
short_desc="Python2 2D/3D plotting library"
|
short_desc="Python2 2D/3D plotting library"
|
||||||
maintainer="Alessio Sergi <al3hex@gmail.com>"
|
maintainer="Alessio Sergi <al3hex@gmail.com>"
|
||||||
homepage="http://matplotlib.org/"
|
homepage="http://matplotlib.org/"
|
||||||
license="matplotlib, BSD, MIT"
|
license="matplotlib, BSD, MIT"
|
||||||
distfiles="${PYPI_SITE}/m/matplotlib/matplotlib-${version}.tar.gz"
|
distfiles="${PYPI_SITE}/m/matplotlib/matplotlib-${version}.tar.gz"
|
||||||
checksum=61f201c6a82e89e4d9e324266203fad44f95fd8f36d8eec0d8690273e1182f75
|
checksum=67b08b1650a00a6317d94b76a30a47320087e5244920604c5462188cba0c2646
|
||||||
|
|
||||||
export XDG_RUNTIME_DIR=/tmp
|
export XDG_RUNTIME_DIR=/tmp
|
||||||
|
|
||||||
|
@ -62,11 +59,8 @@ python-matplotlib-data_package() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
python3.4-matplotlib_package() {
|
python3.4-matplotlib_package() {
|
||||||
replaces="python3.4-matplotlib-cairo>=0 python3.4-matplotlib-gtk3>=0
|
|
||||||
python3.4-matplotlib-qtshared>=0 python3.4-matplotlib-qt4>=0
|
|
||||||
python3.4-matplotlib-qt5>=0 python3.4-matplotlib-tk>=0 python3.4-matplotlib-web>=0"
|
|
||||||
depends="python-matplotlib-data>=${version}_${revision} python3.4-numpy
|
depends="python-matplotlib-data>=${version}_${revision} python3.4-numpy
|
||||||
python3.4-six python3.4-dateutil python3.4-parsing python3.4-pytz"
|
python3.4-cycler python3.4-dateutil python3.4-parsing python3.4-pytz"
|
||||||
short_desc="${short_desc/Python2/Python3.4}"
|
short_desc="${short_desc/Python2/Python3.4}"
|
||||||
pycompile_version="3.4"
|
pycompile_version="3.4"
|
||||||
pycompile_module="matplotlib mpl_toolkits pylab.py"
|
pycompile_module="matplotlib mpl_toolkits pylab.py"
|
||||||
|
|
Loading…
Add table
Reference in a new issue