[seaborn] 14/35: New upstream release - absorbed all previously included patches

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch debian
in repository seaborn.

commit d54a0913519a9337a398c510bd8905d06c142efe
Author: Yaroslav Halchenko <debian at onerussian.com>
Date:   Mon Apr 21 20:57:23 2014 -0400

    New upstream release - absorbed all previously included patches
---
 debian/changelog                                   |  7 +++
 ...t_a9d0131442de919ec52c897b2b6478eb3b1ae85b.diff | 64 ----------------------
 debian/patches/changeset_bf/six_imports.diff       | 21 -------
 debian/patches/series                              |  2 -
 4 files changed, 7 insertions(+), 87 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a323a8a..16aa0ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+seaborn (0.3.1-1) unstable; urgency=medium
+
+  * New upstream release
+    - absorbed all previously included patches
+
+ -- Yaroslav Halchenko <debian at onerussian.com>  Mon, 21 Apr 2014 20:56:40 -0400
+
 seaborn (0.3.0-1) unstable; urgency=low
 
   * Initial Debian packaging (Closes: #742573)
diff --git a/debian/patches/changeset_a9d0131442de919ec52c897b2b6478eb3b1ae85b.diff b/debian/patches/changeset_a9d0131442de919ec52c897b2b6478eb3b1ae85b.diff
deleted file mode 100644
index b0aafcb..0000000
--- a/debian/patches/changeset_a9d0131442de919ec52c897b2b6478eb3b1ae85b.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Yaroslav Halchenko <debian at onerussian.com>
-Subject: BF: make some non-functioning doctests correct smoke tests
-
---- a/seaborn/palettes.py
-+++ b/seaborn/palettes.py
-@@ -61,15 +61,16 @@ def color_palette(name=None, n_colors=6,
- 
-     Examples
-     --------
--    >>> color_palette("muted")
-+    >>> p = color_palette("muted")
- 
--    >>> color_palette("Blues_d", 10)
-+    >>> p = color_palette("Blues_d", 10)
- 
--    >>> color_palette("Set1", desat=.7)
-+    >>> p = color_palette("Set1", desat=.7)
- 
-+    >>> import matplotlib.pyplot as plt
-     >>> with color_palette("husl", 8):
--    >>>     f, ax = plt.subplots()
--    >>>     ax.plot(x, y)
-+    ...     f, ax = plt.subplots()
-+    ...     ax.plot(x, y)                  # doctest: +SKIP
- 
-     See Also
-     --------
---- a/seaborn/rcmod.py
-+++ b/seaborn/rcmod.py
-@@ -148,13 +148,14 @@ def axes_style(style=None, rc=None):
- 
-     Examples
-     --------
--    >>> axes_style("whitegrid")
-+    >>> st = axes_style("whitegrid")
- 
-     >>> set_style("ticks", {"xtick.major.size": 8, "ytick.major.size": 8})
- 
-+    >>> import matplotlib.pyplot as plt
-     >>> with axes_style("white"):
-     ...     f, ax = plt.subplots()
--    ...     ax.plot(x, y)
-+    ...     ax.plot(x, y)               # doctest: +SKIP
- 
-     See Also
-     --------
-@@ -320,13 +321,14 @@ def plotting_context(context=None, rc=No
- 
-     Examples
-     --------
--    >>> plotting_context("poster")
-+    >>> c = plotting_context("poster")
- 
--    >>> plotting_context("talk", {"lines.linewidth": 2})
-+    >>> c = plotting_context("talk", {"lines.linewidth": 2})
- 
-+    >>> import matplotlib.pyplot as plt
-     >>> with plotting_context("paper"):
-     ...     f, ax = plt.subplots()
--    ...     ax.plot(x, y)
-+    ...     ax.plot(x, y)                 # doctest: +SKIP
- 
-     See Also
-     --------
diff --git a/debian/patches/changeset_bf/six_imports.diff b/debian/patches/changeset_bf/six_imports.diff
deleted file mode 100644
index 9a369fc..0000000
--- a/debian/patches/changeset_bf/six_imports.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/seaborn/algorithms.py
-+++ b/seaborn/algorithms.py
-@@ -2,7 +2,7 @@
- from __future__ import division
- import numpy as np
- from scipy import stats
--from six.moves import range
-+from .external.six.moves import range
- 
- 
- def bootstrap(*args, **kwargs):
---- a/seaborn/tests/test_algorithms.py
-+++ b/seaborn/tests/test_algorithms.py
-@@ -1,6 +1,6 @@
- import numpy as np
- from scipy import stats
--from six.moves import range
-+from ..external.six.moves import range
- 
- import numpy.testing as npt
- from numpy.testing import assert_array_equal
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f393cfe..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-changeset_bf/six_imports.diff
-changeset_a9d0131442de919ec52c897b2b6478eb3b1ae85b.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/seaborn.git