| |
@@ -1,19 +1,43 @@
|
| |
- diff -ur seaborn-0.8.1/seaborn/algorithms.py seaborn-0.8.1.six/seaborn/algorithms.py
|
| |
- --- seaborn-0.8.1/seaborn/algorithms.py 2014-10-25 05:08:28.000000000 +0200
|
| |
- +++ seaborn-0.8.1.six/seaborn/algorithms.py 2018-03-08 10:57:08.952446097 +0100
|
| |
- @@ -2,7 +2,7 @@
|
| |
- from __future__ import division
|
| |
+ From 7f6bca621fb7abf16f5a8a15f4f0f69bcee05140 Mon Sep 17 00:00:00 2001
|
| |
+ From: Sergio Pascual <sergiopr@fis.ucm.es>
|
| |
+ Date: Thu, 8 Mar 2018 11:16:08 +0100
|
| |
+ Subject: [PATCH 1/3] Use external six.
|
| |
+
|
| |
+ Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
| |
+ ---
|
| |
+ seaborn/algorithms.py | 4 ++--
|
| |
+ seaborn/axisgrid.py | 2 +-
|
| |
+ seaborn/categorical.py | 4 ++--
|
| |
+ seaborn/matrix.py | 2 +-
|
| |
+ seaborn/palettes.py | 4 ++--
|
| |
+ seaborn/regression.py | 2 +-
|
| |
+ seaborn/relational.py | 2 +-
|
| |
+ seaborn/tests/test_algorithms.py | 2 +-
|
| |
+ seaborn/tests/test_matrix.py | 2 +-
|
| |
+ seaborn/timeseries.py | 2 +-
|
| |
+ seaborn/utils.py | 4 ++--
|
| |
+ 11 files changed, 15 insertions(+), 15 deletions(-)
|
| |
+
|
| |
+ diff --git a/seaborn/algorithms.py b/seaborn/algorithms.py
|
| |
+ index 8a7a590..59350d8 100644
|
| |
+ --- a/seaborn/algorithms.py
|
| |
+ +++ b/seaborn/algorithms.py
|
| |
+ @@ -3,8 +3,8 @@ from __future__ import division
|
| |
import numpy as np
|
| |
from scipy import stats
|
| |
+ import warnings
|
| |
+ -from .external.six import string_types
|
| |
-from .external.six.moves import range
|
| |
+ +from six import string_types
|
| |
+from six.moves import range
|
| |
|
| |
|
| |
def bootstrap(*args, **kwargs):
|
| |
- diff -ur seaborn-0.8.1/seaborn/axisgrid.py seaborn-0.8.1.six/seaborn/axisgrid.py
|
| |
- --- seaborn-0.8.1/seaborn/axisgrid.py 2017-09-03 00:54:02.000000000 +0200
|
| |
- +++ seaborn-0.8.1.six/seaborn/axisgrid.py 2018-03-08 10:57:31.693798377 +0100
|
| |
- @@ -12,7 +12,7 @@
|
| |
+ diff --git a/seaborn/axisgrid.py b/seaborn/axisgrid.py
|
| |
+ index ac652e5..ea20d1c 100644
|
| |
+ --- a/seaborn/axisgrid.py
|
| |
+ +++ b/seaborn/axisgrid.py
|
| |
+ @@ -12,7 +12,7 @@ import matplotlib.pyplot as plt
|
| |
|
| |
from . import utils
|
| |
from .palettes import color_palette, blend_palette
|
| |
@@ -22,10 +46,11 @@
|
| |
from .distributions import distplot, kdeplot, _freedman_diaconis_bins
|
| |
|
| |
|
| |
- diff -ur seaborn-0.8.1/seaborn/categorical.py seaborn-0.8.1.six/seaborn/categorical.py
|
| |
- --- seaborn-0.8.1/seaborn/categorical.py 2017-09-03 00:54:02.000000000 +0200
|
| |
- +++ seaborn-0.8.1.six/seaborn/categorical.py 2018-03-08 10:57:46.288024452 +0100
|
| |
- @@ -10,8 +10,8 @@
|
| |
+ diff --git a/seaborn/categorical.py b/seaborn/categorical.py
|
| |
+ index 519e88c..21aa12f 100644
|
| |
+ --- a/seaborn/categorical.py
|
| |
+ +++ b/seaborn/categorical.py
|
| |
+ @@ -10,8 +10,8 @@ import matplotlib.patches as Patches
|
| |
import matplotlib.pyplot as plt
|
| |
import warnings
|
| |
|
| |
@@ -36,10 +61,11 @@
|
| |
|
| |
from . import utils
|
| |
from .utils import iqr, categorical_order, remove_na
|
| |
- diff -ur seaborn-0.8.1/seaborn/matrix.py seaborn-0.8.1.six/seaborn/matrix.py
|
| |
- --- seaborn-0.8.1/seaborn/matrix.py 2017-09-03 00:54:02.000000000 +0200
|
| |
- +++ seaborn-0.8.1.six/seaborn/matrix.py 2018-03-08 10:57:57.648200429 +0100
|
| |
- @@ -16,7 +16,7 @@
|
| |
+ diff --git a/seaborn/matrix.py b/seaborn/matrix.py
|
| |
+ index 288702a..3198cb4 100644
|
| |
+ --- a/seaborn/matrix.py
|
| |
+ +++ b/seaborn/matrix.py
|
| |
+ @@ -15,7 +15,7 @@ from .axisgrid import Grid
|
| |
from .utils import (despine, axis_ticklabels_overlap, relative_luminance,
|
| |
to_utf8)
|
| |
|
| |
@@ -48,10 +74,11 @@
|
| |
|
| |
|
| |
__all__ = ["heatmap", "clustermap"]
|
| |
- diff -ur seaborn-0.8.1/seaborn/palettes.py seaborn-0.8.1.six/seaborn/palettes.py
|
| |
- --- seaborn-0.8.1/seaborn/palettes.py 2017-07-07 23:08:37.000000000 +0200
|
| |
- +++ seaborn-0.8.1.six/seaborn/palettes.py 2018-03-08 10:59:08.865303633 +0100
|
| |
- @@ -6,8 +6,8 @@
|
| |
+ diff --git a/seaborn/palettes.py b/seaborn/palettes.py
|
| |
+ index b35a105..f971781 100644
|
| |
+ --- a/seaborn/palettes.py
|
| |
+ +++ b/seaborn/palettes.py
|
| |
+ @@ -6,8 +6,8 @@ import numpy as np
|
| |
import matplotlib as mpl
|
| |
|
| |
from .external import husl
|
| |
@@ -61,37 +88,50 @@
|
| |
+from six.moves import range
|
| |
|
| |
from .utils import desaturate, set_hls_values, get_color_cycle
|
| |
- from .xkcd_rgb import xkcd_rgb
|
| |
- diff -ur seaborn-0.8.1/seaborn/regression.py seaborn-0.8.1.six/seaborn/regression.py
|
| |
- --- seaborn-0.8.1/seaborn/regression.py 2017-07-07 23:08:37.000000000 +0200
|
| |
- +++ seaborn-0.8.1.six/seaborn/regression.py 2018-03-08 11:00:04.914171871 +0100
|
| |
- @@ -18,8 +18,8 @@
|
| |
+ from .colors import xkcd_rgb, crayons
|
| |
+ diff --git a/seaborn/regression.py b/seaborn/regression.py
|
| |
+ index 1485eb8..563d72f 100644
|
| |
+ --- a/seaborn/regression.py
|
| |
+ +++ b/seaborn/regression.py
|
| |
+ @@ -16,7 +16,7 @@ try:
|
| |
except ImportError:
|
| |
_has_statsmodels = False
|
| |
|
| |
-from .external.six import string_types
|
| |
- -from .external.six.moves import range
|
| |
+from six import string_types
|
| |
- +from six.moves import range
|
| |
|
| |
from . import utils
|
| |
from . import algorithms as algo
|
| |
- diff -ur seaborn-0.8.1/seaborn/tests/test_algorithms.py seaborn-0.8.1.six/seaborn/tests/test_algorithms.py
|
| |
- --- seaborn-0.8.1/seaborn/tests/test_algorithms.py 2014-10-25 05:08:29.000000000 +0200
|
| |
- +++ seaborn-0.8.1.six/seaborn/tests/test_algorithms.py 2018-03-08 10:59:39.704781359 +0100
|
| |
- @@ -1,6 +1,6 @@
|
| |
+ diff --git a/seaborn/relational.py b/seaborn/relational.py
|
| |
+ index ccfc257..63bb018 100644
|
| |
+ --- a/seaborn/relational.py
|
| |
+ +++ b/seaborn/relational.py
|
| |
+ @@ -8,7 +8,7 @@ import pandas as pd
|
| |
+ import matplotlib as mpl
|
| |
+ import matplotlib.pyplot as plt
|
| |
+
|
| |
+ -from .external.six import string_types
|
| |
+ +from six import string_types
|
| |
+
|
| |
+ from . import utils
|
| |
+ from .utils import (categorical_order, get_color_cycle, ci_to_errsize, sort_df,
|
| |
+ diff --git a/seaborn/tests/test_algorithms.py b/seaborn/tests/test_algorithms.py
|
| |
+ index 1beede9..5e3a5b1 100644
|
| |
+ --- a/seaborn/tests/test_algorithms.py
|
| |
+ +++ b/seaborn/tests/test_algorithms.py
|
| |
+ @@ -1,5 +1,5 @@
|
| |
import numpy as np
|
| |
- from scipy import stats
|
| |
-from ..external.six.moves import range
|
| |
+from six.moves import range
|
| |
|
| |
- import numpy.testing as npt
|
| |
from numpy.testing import assert_array_equal
|
| |
- diff -ur seaborn-0.8.1/seaborn/tests/test_matrix.py seaborn-0.8.1.six/seaborn/tests/test_matrix.py
|
| |
- --- seaborn-0.8.1/seaborn/tests/test_matrix.py 2017-09-03 00:54:02.000000000 +0200
|
| |
- +++ seaborn-0.8.1.six/seaborn/tests/test_matrix.py 2018-03-08 10:59:27.937599077 +0100
|
| |
- @@ -19,7 +19,7 @@
|
| |
- from . import PlotTestCase
|
| |
+ import pytest
|
| |
+ diff --git a/seaborn/tests/test_matrix.py b/seaborn/tests/test_matrix.py
|
| |
+ index 0bf1a0c..8f52941 100644
|
| |
+ --- a/seaborn/tests/test_matrix.py
|
| |
+ +++ b/seaborn/tests/test_matrix.py
|
| |
+ @@ -18,7 +18,7 @@ from numpy.testing.decorators import skipif
|
| |
+
|
| |
from .. import matrix as mat
|
| |
from .. import color_palette
|
| |
-from ..external.six.moves import range
|
| |
@@ -99,10 +139,11 @@
|
| |
|
| |
try:
|
| |
import fastcluster
|
| |
- diff -ur seaborn-0.8.1/seaborn/timeseries.py seaborn-0.8.1.six/seaborn/timeseries.py
|
| |
- --- seaborn-0.8.1/seaborn/timeseries.py 2017-07-07 23:08:37.000000000 +0200
|
| |
- +++ seaborn-0.8.1.six/seaborn/timeseries.py 2018-03-08 11:00:39.954714674 +0100
|
| |
- @@ -8,7 +8,7 @@
|
| |
+ diff --git a/seaborn/timeseries.py b/seaborn/timeseries.py
|
| |
+ index a3b25bf..5381902 100644
|
| |
+ --- a/seaborn/timeseries.py
|
| |
+ +++ b/seaborn/timeseries.py
|
| |
+ @@ -8,7 +8,7 @@ import matplotlib.pyplot as plt
|
| |
|
| |
import warnings
|
| |
|
| |
@@ -111,17 +152,21 @@
|
| |
|
| |
from . import utils
|
| |
from . import algorithms as algo
|
| |
- diff -ur seaborn-0.8.1/seaborn/utils.py seaborn-0.8.1.six/seaborn/utils.py
|
| |
- --- seaborn-0.8.1/seaborn/utils.py 2017-09-03 00:54:02.000000000 +0200
|
| |
- +++ seaborn-0.8.1.six/seaborn/utils.py 2018-03-08 11:00:23.226455541 +0100
|
| |
- @@ -13,8 +13,8 @@
|
| |
- from distutils.version import LooseVersion
|
| |
- pandas_has_categoricals = LooseVersion(pd.__version__) >= "0.15"
|
| |
- mpl_ge_150 = LooseVersion(mpl.__version__) >= "1.5.0"
|
| |
+ diff --git a/seaborn/utils.py b/seaborn/utils.py
|
| |
+ index defae8c..9509ab9 100644
|
| |
+ --- a/seaborn/utils.py
|
| |
+ +++ b/seaborn/utils.py
|
| |
+ @@ -10,8 +10,8 @@ import matplotlib as mpl
|
| |
+ import matplotlib.colors as mplcol
|
| |
+ import matplotlib.pyplot as plt
|
| |
+
|
| |
-from .external.six.moves.urllib.request import urlopen, urlretrieve
|
| |
-from .external.six.moves.http_client import HTTPException
|
| |
+from six.moves.urllib.request import urlopen, urlretrieve
|
| |
+from six.moves.http_client import HTTPException
|
| |
|
| |
-
|
| |
- __all__ = ["desaturate", "saturate", "set_hls_values",
|
| |
+ from distutils.version import LooseVersion
|
| |
+ pandas_has_categoricals = LooseVersion(pd.__version__) >= "0.15"
|
| |
+ --
|
| |
+ 2.17.1
|
| |
+
|
| |
There are several theme and API changes, so I think this should only get to F29.