[Python-modules-commits] r30510 - in packages/matplotlib/trunk/debian (11 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Sat Sep 6 19:49:51 UTC 2014
Date: Saturday, September 6, 2014 @ 19:49:50
Author: morph
Revision: 30510
* debian/patches/*
- refreshed, removed patches merged upstream
Modified:
packages/matplotlib/trunk/debian/changelog
packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch
packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch
packages/matplotlib/trunk/debian/patches/50_bts608942_spaces_in_param_args.patch
packages/matplotlib/trunk/debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch
packages/matplotlib/trunk/debian/patches/gtk3agg_check_no-multiprocessing.patch
packages/matplotlib/trunk/debian/patches/gtk3cairo_check_no-multiprocessing.patch
packages/matplotlib/trunk/debian/patches/multiarch-tktcl.patch
packages/matplotlib/trunk/debian/patches/series
Deleted:
packages/matplotlib/trunk/debian/patches/60_deal_with_no_writable_dirs.patch
packages/matplotlib/trunk/debian/patches/fix_infinite_recursion.patch
Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog 2014-09-06 16:37:42 UTC (rev 30509)
+++ packages/matplotlib/trunk/debian/changelog 2014-09-06 19:49:50 UTC (rev 30510)
@@ -9,12 +9,14 @@
- updated b-d to new requirements
* debian/rules
- export XDG_RUNTIME_DIR to prevent build stuck
+ * debian/patches/*
+ - refreshed, removed patches merged upstream
[ Julian Taylor ]
* debian/control:
- update python{,3}-pyparsing dependency to the required version >= 1.5.6
- -- Sandro Tosi <morph at debian.org> Thu, 04 Sep 2014 22:18:36 +0100
+ -- Sandro Tosi <morph at debian.org> Sat, 06 Sep 2014 20:49:30 +0100
matplotlib (1.3.1-2) unstable; urgency=low
Modified: packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch 2014-09-06 16:37:42 UTC (rev 30509)
+++ packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch 2014-09-06 19:49:50 UTC (rev 30510)
@@ -4,7 +4,7 @@
--- a/lib/matplotlib/__init__.py
+++ b/lib/matplotlib/__init__.py
-@@ -607,10 +607,12 @@ def _get_data_path():
+@@ -653,10 +653,12 @@ def _get_data_path():
raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
return path
@@ -18,8 +18,8 @@
# setuptools' namespace_packages may highjack this init file
# so need to try something known to be in matplotlib, not basemap
import matplotlib.afm
-@@ -727,7 +729,7 @@ def matplotlib_fname():
- _get_xdg_config_dir())
+@@ -777,7 +779,7 @@ def matplotlib_fname():
+ home, '.matplotlib', 'matplotlibrc')
return fname
- path = get_data_path() # guaranteed to exist or raise
Modified: packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch 2014-09-06 16:37:42 UTC (rev 30509)
+++ packages/matplotlib/trunk/debian/patches/40_bts608939_draw_markers_description.patch 2014-09-06 19:49:50 UTC (rev 30510)
@@ -3,7 +3,7 @@
--- a/doc/api/api_changes.rst
+++ b/doc/api/api_changes.rst
-@@ -919,7 +919,7 @@ New methods:
+@@ -1143,7 +1143,7 @@ New methods:
* :meth:`draw_markers(self, gc, marker_path, marker_trans, path,
trans, rgbFace)
Modified: packages/matplotlib/trunk/debian/patches/50_bts608942_spaces_in_param_args.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/50_bts608942_spaces_in_param_args.patch 2014-09-06 16:37:42 UTC (rev 30509)
+++ packages/matplotlib/trunk/debian/patches/50_bts608942_spaces_in_param_args.patch 2014-09-06 19:49:50 UTC (rev 30510)
@@ -16,8 +16,8 @@
+ :param ny,ny1: same as nx and nx1, but for row positions.
"""
-
-@@ -253,12 +253,12 @@ class Divider(object):
+ figW, figH = self._fig.get_size_inches()
+@@ -250,12 +250,12 @@ class Divider(object):
(:class:`mpl_toolkits.axes_grid.axes_divider.AxesLocator`) for
specified cell.
@@ -32,7 +32,7 @@
"""
return AxesLocator(self, nx, ny, nx1, ny1)
-@@ -299,12 +299,12 @@ class AxesLocator(object):
+@@ -298,12 +298,12 @@ class AxesLocator(object):
"""
:param axes_divider: An instance of AxesDivider class.
Deleted: packages/matplotlib/trunk/debian/patches/60_deal_with_no_writable_dirs.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/60_deal_with_no_writable_dirs.patch 2014-09-06 16:37:42 UTC (rev 30509)
+++ packages/matplotlib/trunk/debian/patches/60_deal_with_no_writable_dirs.patch 2014-09-06 19:49:50 UTC (rev 30510)
@@ -1,111 +0,0 @@
-Description: deal with the case where there are no writable directories.
-Author: Michael Droettboom <mdboom at gmail.com>
-Bug-Debian: http://bugs.debian.org/719384
-Origin: https://github.com/mdboom/matplotlib/commit/1e8d592ed0439ac6fe8fc08d5efe522799acf4fe
-Reviewed-By: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-09-29
-
---- matplotlib-1.3.0.orig/lib/matplotlib/font_manager.py
-+++ matplotlib-1.3.0/lib/matplotlib/font_manager.py
-@@ -1324,6 +1324,8 @@ if USE_FONTCONFIG and sys.platform != 'w
- return result
-
- else:
-+ _fmcache = None
-+
- if not 'TRAVIS' in os.environ:
- cachedir = get_cachedir()
- if cachedir is not None:
-@@ -1331,8 +1333,6 @@ else:
- _fmcache = os.path.join(cachedir, 'fontList.py3k.cache')
- else:
- _fmcache = os.path.join(cachedir, 'fontList.cache')
-- else:
-- _fmcache = None
-
- fontManager = None
-
---- matplotlib-1.3.0.orig/lib/matplotlib/__init__.py
-+++ matplotlib-1.3.0/lib/matplotlib/__init__.py
-@@ -518,7 +518,11 @@ def _get_xdg_config_dir():
- base directory spec
- <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
- """
-- return os.environ.get('XDG_CONFIG_HOME', os.path.join(get_home(), '.config'))
-+ home = get_home()
-+ if home is None:
-+ return None
-+ else:
-+ return os.environ.get('XDG_CONFIG_HOME', os.path.join(home, '.config'))
-
-
- def _get_xdg_cache_dir():
-@@ -527,7 +531,11 @@ def _get_xdg_cache_dir():
- base directory spec
- <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
- """
-- return os.environ.get('XDG_CACHE_HOME', os.path.join(get_home(), '.cache'))
-+ home = get_home()
-+ if home is None:
-+ return None
-+ else:
-+ return os.environ.get('XDG_CACHE_HOME', os.path.join(home, '.cache'))
-
-
- def _get_config_or_cache_dir(xdg_base):
-@@ -543,22 +551,28 @@ def _get_config_or_cache_dir(xdg_base):
- return _create_tmp_config_dir()
- return configdir
-
-+ p = None
- h = get_home()
-- p = os.path.join(h, '.matplotlib')
-- if (sys.platform.startswith('linux') and
-- not os.path.exists(p)):
-- p = os.path.join(xdg_base, 'matplotlib')
--
-- if os.path.exists(p):
-- if not _is_writable_dir(p):
-- return _create_tmp_config_dir()
-- else:
-- try:
-- mkdirs(p)
-- except OSError:
-- return _create_tmp_config_dir()
-+ if h is not None:
-+ p = os.path.join(h, '.matplotlib')
-+ if (sys.platform.startswith('linux') and
-+ not os.path.exists(p) and
-+ xdg_base is not None):
-+ p = os.path.join(xdg_base, 'matplotlib')
-+
-+ if p is not None:
-+ if os.path.exists(p):
-+ if _is_writable_dir(p):
-+ return p
-+ else:
-+ try:
-+ mkdirs(p)
-+ except OSError:
-+ pass
-+ else:
-+ return p
-
-- return p
-+ return _create_tmp_config_dir()
-
-
- def _get_configdir():
-@@ -716,9 +730,11 @@ def matplotlib_fname():
- if configdir is not None:
- fname = os.path.join(configdir, 'matplotlibrc')
- if os.path.exists(fname):
-+ home = get_home()
- if (sys.platform.startswith('linux') and
-+ home is not None and
- fname == os.path.join(
-- get_home(), '.matplotlib', 'matplotlibrc')):
-+ home, '.matplotlib', 'matplotlibrc')):
- warnings.warn(
- "Found matplotlib configuration in ~/.matplotlib/. "
- "To conform with the XDG base directory standard, "
Modified: packages/matplotlib/trunk/debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch 2014-09-06 16:37:42 UTC (rev 30509)
+++ packages/matplotlib/trunk/debian/patches/70_bts720549_try_StayPuft_for_xkcd.patch 2014-09-06 19:49:50 UTC (rev 30510)
@@ -8,7 +8,7 @@
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/lib/matplotlib/pyplot.py
+++ b/lib/matplotlib/pyplot.py
-@@ -289,7 +289,7 @@ def xkcd(scale=1, length=100, randomness
+@@ -300,7 +300,7 @@ def xkcd(scale=1, length=100, randomness
from matplotlib import patheffects
context = rc_context()
try:
Deleted: packages/matplotlib/trunk/debian/patches/fix_infinite_recursion.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/fix_infinite_recursion.patch 2014-09-06 16:37:42 UTC (rev 30509)
+++ packages/matplotlib/trunk/debian/patches/fix_infinite_recursion.patch 2014-09-06 19:49:50 UTC (rev 30510)
@@ -1,22 +0,0 @@
-Description: fix infinite recursion in units with ndarray subclasses
-Origin: upstream, https://github.com/matplotlib/matplotlib/commit/21fd7c03ba1444
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=729590
-Last-Update: 2013-12-24
-
---- a/lib/matplotlib/units.py
-+++ b/lib/matplotlib/units.py
-@@ -145,7 +145,13 @@
- return converter
- except AttributeError:
- # not a masked_array
-- converter = self.get_converter(xravel[0])
-+ # Make sure we don't recurse forever -- it's possible for
-+ # ndarray subclasses to continue to return subclasses and
-+ # not ever return a non-subclass for a single element.
-+ next_item = xravel[0]
-+ if (not isinstance(next_item, np.ndarray) or
-+ next_item.shape != x.shape):
-+ converter = self.get_converter(next_item)
- return converter
-
- if converter is None and iterable(x):
Modified: packages/matplotlib/trunk/debian/patches/gtk3agg_check_no-multiprocessing.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/gtk3agg_check_no-multiprocessing.patch 2014-09-06 16:37:42 UTC (rev 30509)
+++ packages/matplotlib/trunk/debian/patches/gtk3agg_check_no-multiprocessing.patch 2014-09-06 19:49:50 UTC (rev 30510)
@@ -10,7 +10,7 @@
--- a/setupext.py
+++ b/setupext.py
-@@ -1587,24 +1587,9 @@ class BackendGtk3Agg(OptionalBackendPack
+@@ -1744,24 +1744,9 @@ class BackendGtk3Agg(OptionalBackendPack
# This check needs to be performed out-of-process, because
# importing gi and then importing regular old pygtk afterward
# segfaults the interpreter.
Modified: packages/matplotlib/trunk/debian/patches/gtk3cairo_check_no-multiprocessing.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/gtk3cairo_check_no-multiprocessing.patch 2014-09-06 16:37:42 UTC (rev 30509)
+++ packages/matplotlib/trunk/debian/patches/gtk3cairo_check_no-multiprocessing.patch 2014-09-06 19:49:50 UTC (rev 30510)
@@ -1,6 +1,6 @@
--- a/setupext.py
+++ b/setupext.py
-@@ -1630,7 +1630,10 @@ class BackendGtk3Cairo(OptionalBackendPa
+@@ -1740,7 +1740,10 @@ class BackendGtk3Agg(OptionalBackendPack
def check_requirements(self):
if 'TRAVIS' in os.environ:
raise CheckFailed("Can't build with Travis")
Modified: packages/matplotlib/trunk/debian/patches/multiarch-tktcl.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/multiarch-tktcl.patch 2014-09-06 16:37:42 UTC (rev 30509)
+++ packages/matplotlib/trunk/debian/patches/multiarch-tktcl.patch 2014-09-06 19:49:50 UTC (rev 30510)
@@ -3,11 +3,9 @@
Forwarded: no, only if we upstream multiarchification
Author: Julian Taylor <jtaylor at ubuntu.com>
-Index: matplotlib-1.3.1/setupext.py
-===================================================================
---- matplotlib-1.3.1.orig/setupext.py 2013-10-29 07:19:22.483793802 +0100
-+++ matplotlib-1.3.1/setupext.py 2013-10-29 07:20:01.504272247 +0100
-@@ -1235,13 +1235,16 @@
+--- a/setupext.py
++++ b/setupext.py
+@@ -1391,13 +1391,16 @@ class BackendTkAgg(OptionalBackendPackag
except ImportError:
return None
Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series 2014-09-06 16:37:42 UTC (rev 30509)
+++ packages/matplotlib/trunk/debian/patches/series 2014-09-06 19:49:50 UTC (rev 30510)
@@ -2,9 +2,7 @@
20_matplotlibrc_path_search_fix.patch
40_bts608939_draw_markers_description.patch
50_bts608942_spaces_in_param_args.patch
-60_deal_with_no_writable_dirs.patch
70_bts720549_try_StayPuft_for_xkcd.patch
multiarch-tktcl.patch
-fix_infinite_recursion.patch
gtk3agg_check_no-multiprocessing.patch
gtk3cairo_check_no-multiprocessing.patch
More information about the Python-modules-commits
mailing list