Compare commits
155 Commits
f17
...
epel8-play
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c1cba6ae2d | ||
|
|
588e490738 | ||
|
|
6ae3a9e1d1 | ||
|
|
831ec4cba0 | ||
|
|
49e6227f01 | ||
|
|
120f1b74da | ||
|
|
b5e6655ad8 | ||
|
|
6e771d1530 | ||
|
|
b1b97b1ed1 | ||
|
|
17130085de | ||
|
|
f171297f40 | ||
|
|
af995aa143 | ||
|
|
308245a86e | ||
|
|
7424178997 | ||
|
|
cc106d1c4a | ||
|
|
7901631a85 | ||
|
|
b4eba4ae21 | ||
|
|
b8683378dd | ||
|
|
9fde50abab | ||
|
|
ed3fa9581d | ||
|
|
c08eccf6ad | ||
|
|
a0fbf93967 | ||
|
|
6f3ec368b4 | ||
|
|
d2fa0263b8 | ||
|
|
c385e2c1a9 | ||
|
|
6995ee3297 | ||
|
|
19b5ff96fa | ||
|
|
1dcb7afa2a | ||
|
|
ee42f59462 | ||
|
|
8293bc2589 | ||
|
|
20e40c3953 | ||
|
|
a6c4a06cef | ||
|
|
862f207d27 | ||
|
|
6f741c4a02 | ||
|
|
b89d120a97 | ||
|
|
1b8cd73b7e | ||
|
|
69d38c5f1e | ||
|
|
725edd957b | ||
|
|
c48ca2e7fd | ||
|
|
5c2bf08c46 | ||
|
|
7930b4df8d | ||
|
|
ffa18cbcd2 | ||
|
|
c0a5a7d07f | ||
|
|
c1840d0738 | ||
|
|
c89bd06dd9 | ||
|
|
b11ac2671c | ||
|
|
15844872fc | ||
|
|
ad961d502c | ||
|
|
bf010710f1 | ||
|
|
f46b703e96 | ||
|
|
da0bd4c413 | ||
|
|
c409bffb3d | ||
|
|
172edad3e8 | ||
|
|
c3e31d8c7e | ||
|
|
bc53b538e3 | ||
|
|
14e86457fd | ||
|
|
8d6885671d | ||
|
|
b470c189c1 | ||
|
|
75d0d8966b | ||
|
|
0326098544 | ||
|
|
2d712efe1e | ||
|
|
09769170a4 | ||
|
|
3f6380df61 | ||
|
|
c9345fa6ce | ||
|
|
4cf6018279 | ||
|
|
f28833ef2d | ||
|
|
58a05487aa | ||
|
|
5ff9cbe460 | ||
|
|
730689d98e | ||
|
|
14e87c4546 | ||
|
|
e9a5a6f0c0 | ||
|
|
68a10c0be2 | ||
|
|
cf584d71bb | ||
|
|
c20c3de8d0 | ||
|
|
33684553c0 | ||
|
|
0505957232 | ||
|
|
886c137f30 | ||
|
|
61b48deb75 | ||
|
|
af22a586b1 | ||
|
|
2e2f0e7aa2 | ||
|
|
cab430591a | ||
|
|
cf0338c697 | ||
|
|
08fc8aa374 | ||
|
|
82ec7425cf | ||
|
|
8c2171471b | ||
|
|
b295321e02 | ||
|
|
00a8b9c8fd | ||
|
|
844271bb32 | ||
|
|
da083597a2 | ||
|
|
1c7f1a4e48 | ||
|
|
959576b111 | ||
|
|
a402cee11b | ||
|
|
ee7e32500b | ||
|
|
0316efe86f | ||
|
|
a6629ee97c | ||
|
|
267dd5c6f4 | ||
|
|
ecfdac6c70 | ||
|
|
632ebab3f1 | ||
|
|
ae3945e801 | ||
|
|
8314ea342f | ||
|
|
760f924558 | ||
|
|
8e6fb6a047 | ||
|
|
95c4d0eaf5 | ||
|
|
cfae272b51 | ||
|
|
c901c6602b | ||
|
|
96f1b73a85 | ||
|
|
e065ba8c72 | ||
|
|
108153e46c | ||
|
|
69fbdf849b | ||
|
|
a0ff1b7b0d | ||
|
|
a9a2c96250 | ||
|
|
5ddd160fd3 | ||
|
|
13c730c10e | ||
|
|
13ef95ae8f | ||
|
|
b7fd65cd9f | ||
|
|
b9a2f5516d | ||
|
|
9411cfc02e | ||
|
|
9c2074e497 | ||
|
|
732ad8bbfe | ||
|
|
8c9cc20e2a | ||
|
|
76883b8317 | ||
|
|
98dd5e3da2 | ||
|
|
dd3b8abfa9 | ||
|
|
3d4898c537 | ||
|
|
3b5c19b1c1 | ||
|
|
d42870f60f | ||
|
|
68e041327a | ||
|
|
7731b0f8b4 | ||
|
|
8736c81a32 | ||
|
|
12e8a6231d | ||
|
|
b69e56e8d0 | ||
|
|
be26c9bf21 | ||
|
|
f7ffbd877f | ||
|
|
14b1524911 | ||
|
|
674876c696 | ||
|
|
81fc2e8024 | ||
|
|
0a7be6ae46 | ||
|
|
e5fc5ec392 | ||
|
|
90bbb1ede9 | ||
|
|
c4143b65b0 | ||
|
|
83a27676aa | ||
|
|
adaf51ea57 | ||
|
|
ab00be2ba0 | ||
|
|
b2c1943ea5 | ||
|
|
c89b645d96 | ||
|
|
b58a0f66d3 | ||
|
|
eb9a122389 | ||
|
|
11c0529c89 | ||
|
|
bce7fc7101 | ||
|
|
f2d3f53a8d | ||
|
|
03883d02e8 | ||
|
|
5e8c5cddc3 | ||
|
|
cfeed65034 | ||
|
|
8a5f96fc9d | ||
|
|
2114656575 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,3 +0,0 @@
|
||||
matplotlib-1.0.0-without-gpc.tar.gz
|
||||
/matplotlib-1.0.1-without-gpc.tar.gz
|
||||
/mpl_sampledata-1.0.1.tar.gz
|
||||
@@ -1,188 +0,0 @@
|
||||
--- a/lib/matplotlib/axes.py
|
||||
+++ b/lib/matplotlib/axes.py
|
||||
@@ -2679,18 +2679,20 @@ class Axes(martist.Artist):
|
||||
def xaxis_date(self, tz=None):
|
||||
"""Sets up x-axis ticks and labels that treat the x data as dates.
|
||||
|
||||
- *tz* is the time zone to use in labeling dates. Defaults to rc value.
|
||||
+ *tz* is a timezone string or :class:`tzinfo` instance.
|
||||
+ Defaults to rc value.
|
||||
"""
|
||||
# should be enough to inform the unit conversion interface
|
||||
- # dates are comng in
|
||||
- self.xaxis.axis_date()
|
||||
+ # dates are coming in
|
||||
+ self.xaxis.axis_date(tz)
|
||||
|
||||
def yaxis_date(self, tz=None):
|
||||
"""Sets up y-axis ticks and labels that treat the y data as dates.
|
||||
|
||||
- *tz* is the time zone to use in labeling dates. Defaults to rc value.
|
||||
+ *tz* is a timezone string or :class:`tzinfo` instance.
|
||||
+ Defaults to rc value.
|
||||
"""
|
||||
- self.yaxis.axis_date()
|
||||
+ self.yaxis.axis_date(tz)
|
||||
|
||||
def format_xdata(self, x):
|
||||
"""
|
||||
@@ -3808,7 +3810,7 @@ class Axes(martist.Artist):
|
||||
*fmt*: string
|
||||
The plot format string.
|
||||
|
||||
- *tz*: [ None | timezone string ]
|
||||
+ *tz*: [ None | timezone string | :class:`tzinfo` instance]
|
||||
The time zone to use in labeling dates. If *None*, defaults to rc
|
||||
value.
|
||||
|
||||
diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py
|
||||
index 85e078c..a825d8e 100644
|
||||
--- a/lib/matplotlib/axis.py
|
||||
+++ b/lib/matplotlib/axis.py
|
||||
@@ -1249,21 +1249,21 @@ class Axis(artist.Artist):
|
||||
def update_units(self, data):
|
||||
"""
|
||||
introspect *data* for units converter and update the
|
||||
- axis.converter instance if necessary. Return *True* is *data* is
|
||||
- registered for unit conversion
|
||||
+ axis.converter instance if necessary. Return *True*
|
||||
+ if *data* is registered for unit conversion.
|
||||
"""
|
||||
|
||||
converter = munits.registry.get_converter(data)
|
||||
- if converter is None: return False
|
||||
+ if converter is None:
|
||||
+ return False
|
||||
|
||||
neednew = self.converter!=converter
|
||||
self.converter = converter
|
||||
default = self.converter.default_units(data, self)
|
||||
- #print 'update units: default="%s", units=%s"'%(default, self.units)
|
||||
+ #print 'update units: default=%s, units=%s'%(default, self.units)
|
||||
if default is not None and self.units is None:
|
||||
self.set_units(default)
|
||||
|
||||
-
|
||||
if neednew:
|
||||
self._update_axisinfo()
|
||||
return True
|
||||
@@ -1484,14 +1484,21 @@ class Axis(artist.Artist):
|
||||
self.major.locator.zoom(direction)
|
||||
|
||||
|
||||
- def axis_date(self):
|
||||
+ def axis_date(self, tz=None):
|
||||
"""
|
||||
Sets up x-axis ticks and labels that treat the x data as dates.
|
||||
+ *tz* is a :class:`tzinfo` instance or a timezone string.
|
||||
+ This timezone is used to create date labels.
|
||||
"""
|
||||
+ # By providing a sample datetime instance with the desired
|
||||
+ # timezone, the registered converter can be selected,
|
||||
+ # and the "units" attribute, which is the timezone, can
|
||||
+ # be set.
|
||||
import datetime
|
||||
- # should be enough to inform the unit conversion interface
|
||||
- # dates are comng in
|
||||
- self.update_units(datetime.date(2009,1,1))
|
||||
+ if isinstance(tz, (str, unicode)):
|
||||
+ import pytz
|
||||
+ tz = pytz.timezone(tz)
|
||||
+ self.update_units(datetime.datetime(2009,1,1,0,0,0,0,tz))
|
||||
|
||||
|
||||
class XAxis(Axis):
|
||||
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
|
||||
index 7a2f9f3..9018315 100644
|
||||
--- a/lib/matplotlib/dates.py
|
||||
+++ b/lib/matplotlib/dates.py
|
||||
@@ -1104,15 +1104,26 @@ def weeks(w):
|
||||
|
||||
|
||||
class DateConverter(units.ConversionInterface):
|
||||
- """The units are equivalent to the timezone."""
|
||||
+ """
|
||||
+ Converter for datetime.date and datetime.datetime data,
|
||||
+ or for date/time data represented as it would be converted
|
||||
+ by :func:`date2num`.
|
||||
+
|
||||
+ The 'unit' tag for such data is None or a tzinfo instance.
|
||||
+ """
|
||||
|
||||
@staticmethod
|
||||
def axisinfo(unit, axis):
|
||||
- 'return the unit AxisInfo'
|
||||
- # make sure that the axis does not start at 0
|
||||
+ """
|
||||
+ Return the :class:`~matplotlib.units.AxisInfo` for *unit*.
|
||||
+
|
||||
+ *unit* is a tzinfo instance or None.
|
||||
+ The *axis* argument is required but not used.
|
||||
+ """
|
||||
+ tz = unit
|
||||
|
||||
- majloc = AutoDateLocator(tz=unit)
|
||||
- majfmt = AutoDateFormatter(majloc, tz=unit)
|
||||
+ majloc = AutoDateLocator(tz=tz)
|
||||
+ majfmt = AutoDateFormatter(majloc, tz=tz)
|
||||
datemin = datetime.date(2000, 1, 1)
|
||||
datemax = datetime.date(2010, 1, 1)
|
||||
|
||||
@@ -1121,12 +1132,28 @@ class DateConverter(units.ConversionInterface):
|
||||
|
||||
@staticmethod
|
||||
def convert(value, unit, axis):
|
||||
- if units.ConversionInterface.is_numlike(value): return value
|
||||
+ """
|
||||
+ If *value* is not already a number or sequence of numbers,
|
||||
+ convert it with :func:`date2num`.
|
||||
+
|
||||
+ The *unit* and *axis* arguments are not used.
|
||||
+ """
|
||||
+ if units.ConversionInterface.is_numlike(value):
|
||||
+ return value
|
||||
return date2num(value)
|
||||
|
||||
@staticmethod
|
||||
def default_units(x, axis):
|
||||
- 'Return the default unit for *x* or None'
|
||||
+ 'Return the tzinfo instance of *x* or of its first element, or None'
|
||||
+ try:
|
||||
+ x = x[0]
|
||||
+ except (TypeError, IndexError):
|
||||
+ pass
|
||||
+
|
||||
+ try:
|
||||
+ return x.tzinfo
|
||||
+ except AttributeError:
|
||||
+ pass
|
||||
return None
|
||||
|
||||
|
||||
diff --git a/lib/matplotlib/units.py b/lib/matplotlib/units.py
|
||||
index 700363a..59b570e 100644
|
||||
--- a/lib/matplotlib/units.py
|
||||
+++ b/lib/matplotlib/units.py
|
||||
@@ -7,8 +7,8 @@ objects, eg a list of datetime objects, as well as for objects that
|
||||
are unit aware. We don't assume any particular units implementation,
|
||||
rather a units implementation must provide a ConversionInterface, and
|
||||
the register with the Registry converter dictionary. For example,
|
||||
-here is a complete implementation which support plotting with native
|
||||
-datetime objects
|
||||
+here is a complete implementation which supports plotting with native
|
||||
+datetime objects::
|
||||
|
||||
|
||||
import matplotlib.units as units
|
||||
@@ -48,7 +48,7 @@ from matplotlib.cbook import iterable, is_numlike, is_string_like
|
||||
class AxisInfo:
|
||||
'information to support default axis labeling and tick labeling, and default limits'
|
||||
def __init__(self, majloc=None, minloc=None,
|
||||
- majfmt=None, minfmt=None, label=None,
|
||||
+ majfmt=None, minfmt=None, label=None,
|
||||
default_limits=None):
|
||||
"""
|
||||
majloc and minloc: TickLocators for the major and minor ticks
|
||||
--
|
||||
1.7.6.2
|
||||
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
@@ -0,0 +1 @@
|
||||
epel8-playground decommissioned : https://pagure.io/epel/issue/136
|
||||
@@ -1,19 +0,0 @@
|
||||
#! /bin/sh
|
||||
|
||||
version=$1
|
||||
|
||||
[ -z $version ] && exit 1
|
||||
|
||||
dir=matplotlib-${version}
|
||||
file=matplotlib-${version}.tar.gz
|
||||
result=matplotlib-${version}-without-gpc.tar.gz
|
||||
|
||||
wget -vc http://downloads.sourceforge.net/matplotlib/$file
|
||||
|
||||
rm -rf matplotlib-${version}
|
||||
tar xzf $file
|
||||
|
||||
rm matplotlib-${version}/agg24/include/agg_conv_gpc.h
|
||||
|
||||
rm -f $result
|
||||
tar czf $result $dir
|
||||
@@ -1,82 +0,0 @@
|
||||
diff -up matplotlib-1.0.1/MANIFEST.in.noagg matplotlib-1.0.1/MANIFEST.in
|
||||
--- matplotlib-1.0.1/MANIFEST.in.noagg 2010-07-06 19:41:55.000000000 -0600
|
||||
+++ matplotlib-1.0.1/MANIFEST.in 2011-05-20 15:45:38.337580769 -0600
|
||||
@@ -18,6 +18,5 @@ recursive-include examples *
|
||||
recursive-include doc *
|
||||
recursive-include src *.cpp *.c *.h *.m
|
||||
recursive-include CXX *.cxx *.hxx *.c *.h
|
||||
-recursive-include agg24 *
|
||||
recursive-include lib *
|
||||
recursive-include ttconv *.cpp *.h
|
||||
diff -up matplotlib-1.0.1/setupext.py.noagg matplotlib-1.0.1/setupext.py
|
||||
--- matplotlib-1.0.1/setupext.py.noagg 2010-07-06 19:41:55.000000000 -0600
|
||||
+++ matplotlib-1.0.1/setupext.py 2011-05-20 16:11:56.977764688 -0600
|
||||
@@ -104,7 +104,6 @@ BUILT_GDK = False
|
||||
BUILT_PATH = False
|
||||
BUILT_TRI = False
|
||||
|
||||
-AGG_VERSION = 'agg24'
|
||||
TCL_TK_CACHE = None
|
||||
|
||||
# for nonstandard installation/build with --prefix variable
|
||||
@@ -551,7 +550,8 @@ def add_agg_flags(module):
|
||||
# before adding the freetype flags since -z comes later
|
||||
add_base_flags(module)
|
||||
add_numpy_flags(module)
|
||||
- module.include_dirs.extend(['src', '%s/include'%AGG_VERSION, '.'])
|
||||
+ module.include_dirs.extend(['src', '/usr/include/agg2', '.'])
|
||||
+ module.libraries.append('agg')
|
||||
|
||||
# put these later for correct link order
|
||||
module.libraries.extend(std_libs)
|
||||
@@ -1251,17 +1251,7 @@ def build_agg(ext_modules, packages):
|
||||
global BUILT_AGG
|
||||
if BUILT_AGG: return # only build it if you you haven't already
|
||||
|
||||
- agg = (
|
||||
- 'agg_trans_affine.cpp',
|
||||
- 'agg_bezier_arc.cpp',
|
||||
- 'agg_curves.cpp',
|
||||
- 'agg_vcgen_dash.cpp',
|
||||
- 'agg_vcgen_stroke.cpp',
|
||||
- 'agg_image_filters.cpp',
|
||||
- )
|
||||
-
|
||||
- deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
|
||||
- deps.extend(['src/mplutils.cpp', 'src/agg_py_transforms.cpp'])
|
||||
+ deps = ['src/mplutils.cpp', 'src/agg_py_transforms.cpp']
|
||||
deps.extend(glob.glob('CXX/*.cxx'))
|
||||
deps.extend(glob.glob('CXX/*.c'))
|
||||
temp_copy('src/_backend_agg.cpp', 'src/backend_agg.cpp')
|
||||
@@ -1284,15 +1274,7 @@ def build_path(ext_modules, packages):
|
||||
global BUILT_PATH
|
||||
if BUILT_PATH: return # only build it if you you haven't already
|
||||
|
||||
- agg = (
|
||||
- 'agg_curves.cpp',
|
||||
- 'agg_bezier_arc.cpp',
|
||||
- 'agg_trans_affine.cpp',
|
||||
- 'agg_vcgen_stroke.cpp',
|
||||
- )
|
||||
-
|
||||
- deps = ['%s/src/%s'%(AGG_VERSION, name) for name in agg]
|
||||
- deps.extend(glob.glob('CXX/*.cxx'))
|
||||
+ deps = glob.glob('CXX/*.cxx')
|
||||
deps.extend(glob.glob('CXX/*.c'))
|
||||
|
||||
temp_copy('src/_path.cpp', 'src/path.cpp')
|
||||
@@ -1317,14 +1299,8 @@ def build_image(ext_modules, packages):
|
||||
global BUILT_IMAGE
|
||||
if BUILT_IMAGE: return # only build it if you you haven't already
|
||||
|
||||
- agg = ('agg_trans_affine.cpp',
|
||||
- 'agg_image_filters.cpp',
|
||||
- 'agg_bezier_arc.cpp',
|
||||
- )
|
||||
-
|
||||
temp_copy('src/_image.cpp', 'src/image.cpp')
|
||||
deps = ['src/image.cpp', 'src/mplutils.cpp']
|
||||
- deps.extend(['%s/src/%s'%(AGG_VERSION,name) for name in agg])
|
||||
deps.extend(glob.glob('CXX/*.cxx'))
|
||||
deps.extend(glob.glob('CXX/*.c'))
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -uNr matplotlib-1.0.1.orig/lib/matplotlib/sphinxext/plot_directive.py matplotlib-1.0.1/lib/matplotlib/sphinxext/plot_directive.py
|
||||
--- matplotlib-1.0.1.orig/lib/matplotlib/sphinxext/plot_directive.py 2011-01-23 05:42:08.000000000 +0900
|
||||
+++ matplotlib-1.0.1/lib/matplotlib/sphinxext/plot_directive.py 2011-01-23 05:44:48.000000000 +0900
|
||||
@@ -346,7 +346,7 @@
|
||||
del options['nofigs']
|
||||
|
||||
formats = setup.config.plot_formats
|
||||
- if type(formats) == str:
|
||||
+ if type(formats) == str or type(formats) == unicode:
|
||||
formats = eval(formats)
|
||||
|
||||
fname = os.path.basename(plot_path)
|
||||
@@ -1,12 +0,0 @@
|
||||
diff -up matplotlib-1.0.1/setupext.py.tkinter matplotlib-1.0.1/setupext.py
|
||||
--- matplotlib-1.0.1/setupext.py.tkinter 2011-10-31 14:58:44.000000000 +0100
|
||||
+++ matplotlib-1.0.1/setupext.py 2011-10-31 14:59:14.000000000 +0100
|
||||
@@ -829,7 +829,7 @@ def check_for_tk():
|
||||
|
||||
if gotit:
|
||||
print_status("Tkinter", "Tkinter: %s, Tk: %s, Tcl: %s" %
|
||||
- (Tkinter.__version__.split()[-2], Tkinter.TkVersion, Tkinter.TclVersion))
|
||||
+ (Tkinter.__version__, Tkinter.TkVersion, Tkinter.TclVersion))
|
||||
else:
|
||||
print_status("Tkinter", "no")
|
||||
if explanation is not None:
|
||||
@@ -1,447 +0,0 @@
|
||||
%if ! (0%{?rhel} > 5)
|
||||
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
%endif
|
||||
|
||||
%{?filter_setup:
|
||||
%filter_provides_in %{python_sitearch}/.*\.so$
|
||||
%filter_setup
|
||||
}
|
||||
|
||||
# We include capability for building a doc subpackage for
|
||||
# documentation. However, building the html documentation requires
|
||||
# python-basemap, and python-basemap requires python-matplotlib to build, so
|
||||
# we have a circular dependence, and so we need to be able to turn off
|
||||
# building of the html documents. Note that when building the html docs,
|
||||
# python-basemap will pull in the existing python-matplotlib from the
|
||||
# repos. So, it's important to set PYTHONPATH to use the newly built modules
|
||||
# from this package.
|
||||
%global withhtmldocs 1
|
||||
|
||||
Name: python-matplotlib
|
||||
Version: 1.0.1
|
||||
Release: 19%{?dist}
|
||||
Summary: Python plotting library
|
||||
|
||||
Group: Development/Libraries
|
||||
License: Python
|
||||
URL: http://sourceforge.net/projects/matplotlib
|
||||
#Modified Sources to remove the one undistributable file
|
||||
#See generate-tarball.sh in fedora cvs repository for logic
|
||||
#sha1sum matplotlib-1.0.1-without-gpc.tar.gz
|
||||
#a8ccbf4c4b9b90c773380cac83e792673837d3de matplotlib-1.0.1-without-gpc.tar.gz
|
||||
Source0: matplotlib-%{version}-without-gpc.tar.gz
|
||||
%if %{withhtmldocs}
|
||||
Source1: http://downloads.sourceforge.net/matplotlib/mpl_sampledata-%{version}.tar.gz
|
||||
%endif
|
||||
Source2: setup.cfg
|
||||
# This patch taken from upstream SVN and will not be needed for releases later than 1.0.1
|
||||
Patch0: matplotlib-1.0.1-plot_directive.patch
|
||||
Patch1: matplotlib-1.0.1-noagg.patch
|
||||
Patch2: 0001-Bugfix-propagate-timezone-info-in-plot_date-xaxis_da.patch
|
||||
# fix build when Tkinter doesn't return an expected value in __version__ (FTBFS)
|
||||
Patch3: matplotlib-1.0.1-tkinter.patch
|
||||
|
||||
# Fix building against libpng 1.5
|
||||
# https://github.com/matplotlib/matplotlib/issues/234
|
||||
# Based on:
|
||||
# https://github.com/matplotlib/matplotlib/commit/45c46672648e3b4a277bf7ff42b3baf56a98bcec
|
||||
Patch4: use-png-accessor-functions.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: python-devel, freetype-devel, libpng-devel, zlib-devel
|
||||
BuildRequires: pygtk2-devel, gtk2-devel
|
||||
BuildRequires: pytz, python-dateutil, numpy
|
||||
BuildRequires: agg-devel
|
||||
BuildRequires: pyparsing
|
||||
Requires: numpy, pytz, python-dateutil
|
||||
Requires: pycairo >= 1.2.0
|
||||
Requires: dejavu-sans-fonts
|
||||
Requires: dvipng
|
||||
Requires: pyparsing
|
||||
|
||||
%description
|
||||
Matplotlib is a pure python plotting library with the goal of making
|
||||
publication quality plots using a syntax familiar to Matlab users. The
|
||||
library uses numpy for handling large data sets and supports a variety
|
||||
of output back-ends.
|
||||
|
||||
|
||||
%package tk
|
||||
Summary: Tk backend for python-matplotlib
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
BuildRequires: tkinter, tk-devel
|
||||
Requires: tkinter
|
||||
|
||||
%description tk
|
||||
%{summary}
|
||||
|
||||
%package wx
|
||||
Summary: wxPython backend for python-matplotlib
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: wxPython
|
||||
BuildRequires: wxPython-devel
|
||||
|
||||
%description wx
|
||||
%{summary}
|
||||
|
||||
%package doc
|
||||
Summary: Documentation files for python-matplotlib
|
||||
Group: Documentation
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%if %{withhtmldocs}
|
||||
BuildRequires: python-sphinx
|
||||
BuildRequires: tex(latex)
|
||||
BuildRequires: dvipng
|
||||
BuildRequires: PyQt4
|
||||
BuildRequires: python-basemap
|
||||
# Some of the docs don't build as python-xlwt is needed. However the review
|
||||
# request isn't yet complete for this package. See:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=613766
|
||||
# BuildRequires: python-xlwt
|
||||
%endif
|
||||
|
||||
%description doc
|
||||
%{summary}
|
||||
|
||||
%prep
|
||||
%if %{withhtmldocs}
|
||||
%setup -q -n matplotlib-%{version} -b1
|
||||
%else
|
||||
%setup -q -n matplotlib-%{version}
|
||||
%endif
|
||||
%patch0 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1 -b .tkinter
|
||||
%patch4 -p1
|
||||
|
||||
# Remove bundled libraries
|
||||
rm -r agg24 lib/matplotlib//pyparsing.py
|
||||
|
||||
# Remove references to bundled libraries
|
||||
%patch1 -p1 -b .noagg
|
||||
sed -i -e s/matplotlib\.pyparsing/pyparsing/g lib/matplotlib/*.py
|
||||
|
||||
chmod -x lib/matplotlib/mpl-data/images/*.svg
|
||||
|
||||
cp %{SOURCE2} ./setup.cfg
|
||||
|
||||
%if %{withhtmldocs}
|
||||
pushd doc
|
||||
echo "examples.download : False" >> matplotlibrc
|
||||
echo "examples.directory : %{_builddir}/mpl_sampledata-%{version}" >> matplotlibrc
|
||||
popd
|
||||
%endif
|
||||
|
||||
%build
|
||||
%{__python} setup.py build
|
||||
|
||||
%if %{withhtmldocs}
|
||||
pushd doc
|
||||
# Set PYTHONPATH in order to use the just built modules
|
||||
export PYTHONPATH=`find %{_builddir} -name lib.linux*`
|
||||
# This really does need to be ran twice
|
||||
%{__python} make.py --small html && %{__python} make.py --small html
|
||||
rm -f build/html/.buildinfo
|
||||
chmod -x build/html/pyplots/make.py
|
||||
sed -i 's/\r//' build/html/_sources/devel/add_new_projection.txt
|
||||
sed -i 's/\r//' build/html/examples/api/font_family_rc.py
|
||||
popd
|
||||
%endif
|
||||
|
||||
# Ensure all example files are non-executable so that the -doc package doesn't
|
||||
# drag in dependencies
|
||||
find examples -name '*.py' -exec chmod a-x '{}' \;
|
||||
|
||||
# Fix line ending in this example file
|
||||
sed -i 's/\r//' examples/api/font_family_rc.py
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
|
||||
chmod +x $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/dates.py
|
||||
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/mpl-data/fonts
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc README.txt license/LICENSE license/LICENSE_enthought.txt
|
||||
%doc license/LICENSE_PAINT license/LICENSE_PIL
|
||||
%doc CHANGELOG CXX INSTALL INTERACTIVE KNOWN_BUGS
|
||||
%doc PKG-INFO TODO
|
||||
%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6
|
||||
%{python_sitearch}/*egg-info
|
||||
%endif
|
||||
%{python_sitearch}/matplotlib/
|
||||
%{python_sitearch}/mpl_toolkits/
|
||||
%{python_sitearch}/pylab.py*
|
||||
%exclude %{python_sitearch}/matplotlib/backends/backend_tkagg.*
|
||||
%exclude %{python_sitearch}/matplotlib/backends/tkagg.*
|
||||
%exclude %{python_sitearch}/matplotlib/backends/_tkagg.so
|
||||
%exclude %{python_sitearch}/matplotlib/backends/backend_wx.*
|
||||
%exclude %{python_sitearch}/matplotlib/backends/backend_wxagg.*
|
||||
|
||||
%files tk
|
||||
%defattr(-,root,root,-)
|
||||
%{python_sitearch}/matplotlib/backends/backend_tkagg.py*
|
||||
%{python_sitearch}/matplotlib/backends/tkagg.py*
|
||||
%{python_sitearch}/matplotlib/backends/_tkagg.so
|
||||
|
||||
%files wx
|
||||
%defattr(-,root,root,-)
|
||||
%{python_sitearch}/matplotlib/backends/backend_wx.py*
|
||||
%{python_sitearch}/matplotlib/backends/backend_wxagg.py*
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%doc examples
|
||||
%if %{withhtmldocs}
|
||||
%doc doc/build/html
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-19
|
||||
- Rebuilt for c++ ABI breakage
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Dec 6 2011 David Malcolm <dmalcolm@redhat.com> - 1.0.1-17
|
||||
- fix the build against libpng 1.5
|
||||
|
||||
* Tue Dec 6 2011 David Malcolm <dmalcolm@redhat.com> - 1.0.1-16
|
||||
- fix egg-info conditional for RHEL
|
||||
|
||||
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 1.0.1-15
|
||||
- Rebuild for new libpng
|
||||
|
||||
* Mon Oct 31 2011 Dan Horák <dan[at]danny.cz> - 1.0.1-14
|
||||
- fix build with new Tkinter which doesn't return an expected value in __version__
|
||||
|
||||
* Thu Sep 15 2011 Jef Spaleta <jspaleta@fedoraproject.org> - 1.0.1-13
|
||||
- apply upstream bugfix for timezone formatting (Bug 735677)
|
||||
|
||||
* Fri May 20 2011 Orion Poplawski <orion@cora.nwra.com> - 1.0.1-12
|
||||
- Add Requires dvipng (Bug 684836)
|
||||
- Build against system agg (Bug 612807)
|
||||
- Use system pyparsing (Bug 702160)
|
||||
|
||||
* Sat Feb 26 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-11
|
||||
- Set PYTHONPATH during html doc building using find to prevent broken builds
|
||||
|
||||
* Sat Feb 26 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-10
|
||||
- Spec file cleanups for readability
|
||||
|
||||
* Sat Feb 26 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-9
|
||||
- Bump and rebuild
|
||||
|
||||
* Sat Feb 26 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-8
|
||||
- Fix spec file typos so package builds
|
||||
|
||||
* Fri Feb 25 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-7
|
||||
- Remove a debugging echo statement from the spec file
|
||||
- Fix some line endings and permissions in -doc sub-package
|
||||
|
||||
* Fri Feb 25 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-6
|
||||
- Spec file cleanups to silence some rpmlint warnings
|
||||
|
||||
* Mon Feb 21 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-5
|
||||
- Add default attr to doc sub-package file list
|
||||
- No longer designate -doc subpackage as noarch
|
||||
- Add arch specific Requires for tk, wx and doc sub-packages
|
||||
|
||||
* Mon Feb 21 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-4
|
||||
- Enable wxPython backend
|
||||
- Make -doc sub-package noarch
|
||||
|
||||
* Mon Feb 21 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-3
|
||||
- Add conditional for optionally building doc sub-package
|
||||
- Add flag to build low res images for documentation
|
||||
- Add matplotlib-1.0.1-plot_directive.patch to fix build of low res images
|
||||
- Remove unused patches
|
||||
|
||||
* Sat Feb 19 2011 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 1.0.1-2
|
||||
- Build and package HTML documentation in -doc sub-package
|
||||
- Move examples to -doc sub-package
|
||||
- Make examples non-executable
|
||||
|
||||
* Fri Feb 18 2011 Thomas Spura <tomspur@fedoraproject.org> - 1.0.1-1
|
||||
- update to new bugfix version (#678489)
|
||||
- set file attributes in tk subpackage
|
||||
- filter private *.so
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.0.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
|
||||
|
||||
* Thu Jul 8 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 1.0.0-1
|
||||
- New upstream release
|
||||
- Remove undistributable file from bundled agg library
|
||||
|
||||
* Thu Jul 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.3-1
|
||||
- New upstream release
|
||||
|
||||
* Thu May 27 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-4
|
||||
- Upstream patch to fix deprecated gtk tooltip warning.
|
||||
|
||||
* Mon Apr 12 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-2
|
||||
- Bump to rebuild against numpy 1.3
|
||||
|
||||
* Thu Apr 1 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.1.2-1
|
||||
- Bump to rebuild against numpy 1.4.0
|
||||
|
||||
* Fri Dec 11 2009 Jon Ciesla <limb@jcomserv.net> - 0.99.1.2
|
||||
- Update to 0.99.1.2
|
||||
|
||||
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.98.5.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Fri Mar 06 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.5-4
|
||||
- Fixed font dep after font guideline change
|
||||
|
||||
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.98.5.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Tue Dec 23 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.5-2
|
||||
- Add dep on DejaVu Sans font for default font support
|
||||
|
||||
* Mon Dec 22 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.5-1
|
||||
- Latest upstream release
|
||||
- Strip out included fonts
|
||||
|
||||
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.98.3-2
|
||||
- Rebuild for Python 2.6
|
||||
|
||||
* Wed Aug 6 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.3-1
|
||||
- Latest upstream release
|
||||
|
||||
* Fri Jul 1 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.98.1-1
|
||||
- Latest upstream release
|
||||
|
||||
* Fri Mar 21 2008 Jef Spaleta <jspaleta[AT]fedoraproject org> - 0.91.2-2
|
||||
- gcc43 cleanups
|
||||
|
||||
* Fri Mar 21 2008 Jef Spaleta <jspaleta[AT]fedoraproject org> - 0.91.2-1
|
||||
- New upstream version
|
||||
- Adding Fedora specific setup.cfg from included template
|
||||
- removed numarry and numerics build requirements
|
||||
|
||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.90.1-6
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Fri Jan 4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-5
|
||||
- Fixed typo in spec.
|
||||
|
||||
* Fri Jan 4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-4
|
||||
- Support for Python Eggs for F9+
|
||||
|
||||
* Thu Jan 3 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.90.1-3
|
||||
- Rebuild for new Tcl 8.5
|
||||
|
||||
* Thu Aug 23 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.1-2
|
||||
- Update license tag to Python
|
||||
- Rebuild for BuildID
|
||||
|
||||
* Mon Jun 04 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.1-1
|
||||
- Update to 0.90.1
|
||||
|
||||
* Wed Feb 14 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.0-2
|
||||
- Rebuild for Tcl/Tk downgrade
|
||||
|
||||
* Sat Feb 10 2007 Jef Spaleta <jspaleta@gmail.com> 0.90.0-2
|
||||
- Release bump for rebuild against new tk
|
||||
|
||||
* Fri Feb 09 2007 Orion Poplawski <orion@cora.nwra.com> 0.90.0-1
|
||||
- Update to 0.90.0
|
||||
|
||||
* Tue Jan 5 2007 Orion Poplawski <orion@cora.nwra.com> 0.87.7-4
|
||||
- Add examples to %%docs
|
||||
|
||||
* Mon Dec 11 2006 Jef Spaleta <jspaleta@gmail.com> 0.87.7-3
|
||||
- Release bump for rebuild against python 2.5 in devel tree
|
||||
|
||||
* Tue Dec 5 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.7-2
|
||||
- Force build of gtk/gtkagg backends in mock (bug #218153)
|
||||
- Change Requires from python-numeric to numpy (bug #218154)
|
||||
|
||||
* Tue Nov 21 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.7-1
|
||||
- Update to 0.87.7 and fix up the defaults to use numpy
|
||||
- Force build of tkagg backend without X server
|
||||
- Use src.rpm from Jef Spaleta, closes bug 216578
|
||||
|
||||
* Fri Oct 6 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.6-1
|
||||
- Update to 0.87.6
|
||||
|
||||
* Thu Sep 7 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.5-1
|
||||
- Update to 0.87.5
|
||||
|
||||
* Thu Jul 27 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.4-1
|
||||
- Update to 0.87.4
|
||||
|
||||
* Wed Jun 7 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.3-1
|
||||
- Update to 0.87.3
|
||||
|
||||
* Mon May 15 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.2-2
|
||||
- Rebuild for new numpy
|
||||
|
||||
* Tue Mar 7 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.2-1
|
||||
- Update to 0.87.2
|
||||
|
||||
* Tue Mar 7 2006 Orion Poplawski <orion@cora.nwra.com> 0.87.1-1
|
||||
- Update to 0.87.1
|
||||
- Add pycairo >= 1.0.2 requires (FC5+ only)
|
||||
|
||||
* Fri Feb 24 2006 Orion Poplawski <orion@cora.nwra.com> 0.87-1
|
||||
- Update to 0.87
|
||||
- Add BR numpy and python-numarray
|
||||
- Add patch to keep Numeric as the default numerix package
|
||||
- Add BR tkinter and tk-devel for TkInter backend
|
||||
- Make separate package for Tk backend
|
||||
|
||||
* Tue Jan 10 2006 Orion Poplawski <orion@cora.nwra.com> 0.86-1
|
||||
- Update to 0.86
|
||||
|
||||
* Thu Dec 22 2005 Orion Poplawski <orion@cora.nwra.com> 0.85-2
|
||||
- Rebuild
|
||||
|
||||
* Sun Nov 20 2005 Orion Poplawski <orion@cora.nwra.com> 0.85-1
|
||||
- New upstream version 0.85
|
||||
|
||||
* Mon Sep 19 2005 Orion Poplawski <orion@cora.nwra.com> 0.84-1
|
||||
- New upstream version 0.84
|
||||
|
||||
* Tue Aug 02 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-3
|
||||
- bump release
|
||||
|
||||
* Tue Aug 02 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-2
|
||||
- Add Requires: python-numeric, pytz, python-dateutil
|
||||
|
||||
* Fri Jul 29 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.2-1
|
||||
- New upstream version matplotlib 0.83.2
|
||||
|
||||
* Thu Jul 28 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.1-2
|
||||
- Bump rel to fix botched tag
|
||||
|
||||
* Thu Jul 28 2005 Orion Poplawski <orion@cora.nwra.com> 0.83.1-1
|
||||
- New upstream version matplotlib 0.83.1
|
||||
|
||||
* Tue Jul 05 2005 Orion Poplawski <orion@cora.nwra.com> 0.82-4
|
||||
- BuildRequires: pytz, python-dateutil - use upstream
|
||||
- Don't use INSTALLED_FILES, list dirs
|
||||
- Fix execute permissions
|
||||
|
||||
* Fri Jul 01 2005 Orion Poplawski <orion@cora.nwra.com> 0.82-3
|
||||
- Use %%{python_sitearch}
|
||||
|
||||
* Thu Jun 30 2005 Orion Poplawski <orion@cora.nwra.com> 0.82-2
|
||||
- Rename to python-matplotlib
|
||||
- Remove unneeded Requires: python
|
||||
- Add private directories to %%files
|
||||
|
||||
* Tue Jun 28 2005 Orion Poplawski <orion@cora.nwra.com> 0.82-1
|
||||
- Initial package for Fedora Extras
|
||||
81
setup.cfg
81
setup.cfg
@@ -1,81 +0,0 @@
|
||||
# Rename this file to setup.cfg to modify matplotlib's
|
||||
# build options.
|
||||
|
||||
[egg_info]
|
||||
tag_svn_revision = 1
|
||||
|
||||
[status]
|
||||
# To suppress display of the dependencies and their versions
|
||||
# at the top of the build log, uncomment the following line:
|
||||
#suppress = True
|
||||
#
|
||||
# Uncomment to insert lots of diagnostic prints in extension code
|
||||
#verbose = True
|
||||
|
||||
[provide_packages]
|
||||
# By default, matplotlib checks for a few dependencies and
|
||||
# installs them if missing. This feature can be turned off
|
||||
# by uncommenting the following lines. Acceptible values are:
|
||||
# True: install, overwrite an existing installation
|
||||
# False: do not install
|
||||
# auto: install only if the package is unavailable. This
|
||||
# is the default behavior
|
||||
#
|
||||
## Date/timezone support:
|
||||
#pytz = False
|
||||
#dateutil = False
|
||||
#
|
||||
## Experimental config package support:
|
||||
enthought.traits = False
|
||||
configobj = False
|
||||
|
||||
[gui_support]
|
||||
# Matplotlib supports multiple GUI toolkits, including Cocoa,
|
||||
# GTK, Fltk, Qt, Qt4, Tk, and WX. Support for many of these
|
||||
# toolkits requires AGG, the Anti-Grain Geometry library, which
|
||||
# is provided by matplotlib and built by default.
|
||||
#
|
||||
# Some backends are written in pure Python, and others require
|
||||
# extension code to be compiled. By default, matplotlib checks
|
||||
# for these GUI toolkits during installation and, if present,
|
||||
# compiles the required extensions to support the toolkit. GTK
|
||||
# support requires the GTK runtime environment and PyGTK. Wx
|
||||
# support requires wxWidgets and wxPython. Tk support requires
|
||||
# Tk and Tkinter. The other GUI toolkits do not require any
|
||||
# extension code, and can be used as long as the libraries are
|
||||
# installed on your system.
|
||||
#
|
||||
# You can uncomment any the following lines if you know you do
|
||||
# not want to use the GUI toolkit. Acceptible values are:
|
||||
# True: build the extension. Exits with a warning if the
|
||||
# required dependencies are not available
|
||||
# False: do not build the extension
|
||||
# auto: build if the required dependencies are available,
|
||||
# otherwise skip silently. This is the default
|
||||
# behavior
|
||||
#
|
||||
gtk = True
|
||||
gtkagg = True
|
||||
tkagg = True
|
||||
wxagg = True
|
||||
|
||||
[rc_options]
|
||||
# User-configurable options
|
||||
#
|
||||
# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg,
|
||||
# GTKCairo, FltkAgg, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
|
||||
#
|
||||
# The Agg, Ps, Pdf and SVG backends do not require external
|
||||
# dependencies. Do not choose GTK, GTKAgg, GTKCairo, TkAgg or WXAgg if
|
||||
# you have disabled the relevent extension modules. Agg will be used
|
||||
# by default.
|
||||
#
|
||||
backend = GTKAgg
|
||||
#
|
||||
# The numerix module was historically used to provide
|
||||
# compatibility between the Numeric, numarray, and NumPy array
|
||||
# packages. Now that NumPy has emerge as the universal array
|
||||
# package for python, numerix is not really necessary and is
|
||||
# maintained to provide backward compatibility. Do not change
|
||||
# this unless you have a compelling reason to do so.
|
||||
numerix = numpy
|
||||
2
sources
2
sources
@@ -1,2 +0,0 @@
|
||||
b4d61df73ffa715f5009063a4ba78745 matplotlib-1.0.1-without-gpc.tar.gz
|
||||
24ee8b490f707a60ed5aaf7259f6bc40 mpl_sampledata-1.0.1.tar.gz
|
||||
@@ -1,79 +0,0 @@
|
||||
diff -up matplotlib-1.0.1/CHANGELOG.png15 matplotlib-1.0.1/CHANGELOG
|
||||
diff -up matplotlib-1.0.1/doc/users/installing.rst.png15 matplotlib-1.0.1/doc/users/installing.rst
|
||||
--- matplotlib-1.0.1/doc/users/installing.rst.png15 2010-07-06 21:41:46.000000000 -0400
|
||||
+++ matplotlib-1.0.1/doc/users/installing.rst 2011-12-06 16:29:05.824621532 -0500
|
||||
@@ -138,7 +138,7 @@ libraries themselves.
|
||||
array support for python (`download
|
||||
<http://sourceforge.net/project/showfiles.php?group_id=1369&package_id=175103>`__)
|
||||
|
||||
-libpng 1.1 (or later)
|
||||
+libpng 1.2 (or later)
|
||||
library for loading and saving :term:`PNG` files (`download
|
||||
<http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
|
||||
zlib. If you are a windows user, you can ignore this since we
|
||||
diff -up matplotlib-1.0.1/src/_png.cpp.png15 matplotlib-1.0.1/src/_png.cpp
|
||||
--- matplotlib-1.0.1/src/_png.cpp.png15 2010-10-12 12:14:42.000000000 -0400
|
||||
+++ matplotlib-1.0.1/src/_png.cpp 2011-12-06 16:29:05.825621532 -0500
|
||||
@@ -350,10 +350,10 @@ _png_module::read_png(const Py::Tuple& a
|
||||
png_set_sig_bytes(png_ptr, 8);
|
||||
png_read_info(png_ptr, info_ptr);
|
||||
|
||||
- png_uint_32 width = info_ptr->width;
|
||||
- png_uint_32 height = info_ptr->height;
|
||||
+ png_uint_32 width = png_get_image_width(png_ptr, info_ptr);
|
||||
+ png_uint_32 height = png_get_image_height(png_ptr, info_ptr);
|
||||
|
||||
- int bit_depth = info_ptr->bit_depth;
|
||||
+ int bit_depth = png_get_bit_depth(png_ptr, info_ptr);
|
||||
|
||||
// Unpack 1, 2, and 4-bit images
|
||||
if (bit_depth < 8)
|
||||
@@ -361,7 +361,7 @@ _png_module::read_png(const Py::Tuple& a
|
||||
|
||||
// If sig bits are set, shift data
|
||||
png_color_8p sig_bit;
|
||||
- if ((info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) &&
|
||||
+ if ((png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_PALETTE) &&
|
||||
png_get_sBIT(png_ptr, info_ptr, &sig_bit))
|
||||
{
|
||||
png_set_shift(png_ptr, sig_bit);
|
||||
@@ -374,13 +374,13 @@ _png_module::read_png(const Py::Tuple& a
|
||||
}
|
||||
|
||||
// Convert palletes to full RGB
|
||||
- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
|
||||
+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
|
||||
{
|
||||
png_set_palette_to_rgb(png_ptr);
|
||||
}
|
||||
|
||||
// If there's an alpha channel convert gray to RGB
|
||||
- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
|
||||
+ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
|
||||
{
|
||||
png_set_gray_to_rgb(png_ptr);
|
||||
}
|
||||
@@ -408,11 +408,11 @@ _png_module::read_png(const Py::Tuple& a
|
||||
npy_intp dimensions[3];
|
||||
dimensions[0] = height; //numrows
|
||||
dimensions[1] = width; //numcols
|
||||
- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
|
||||
+ if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA)
|
||||
{
|
||||
dimensions[2] = 4; //RGBA images
|
||||
}
|
||||
- else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
|
||||
+ else if (png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_COLOR)
|
||||
{
|
||||
dimensions[2] = 3; //RGB images
|
||||
}
|
||||
@@ -421,7 +421,8 @@ _png_module::read_png(const Py::Tuple& a
|
||||
dimensions[2] = 1; //Greyscale images
|
||||
}
|
||||
//For gray, return an x by y array, not an x by y by 1
|
||||
- int num_dims = (info_ptr->color_type & PNG_COLOR_MASK_COLOR) ? 3 : 2;
|
||||
+ int num_dims = (png_get_color_type(png_ptr, info_ptr)
|
||||
+ & PNG_COLOR_MASK_COLOR) ? 3 : 2;
|
||||
|
||||
double max_value = (1 << ((bit_depth < 8) ? 8 : bit_depth)) - 1;
|
||||
PyArrayObject *A = (PyArrayObject *) PyArray_SimpleNew(
|
||||
Reference in New Issue
Block a user