TST: fix python3.3 build issues (on linux at least) #2331

Author: wesm

pandas/__init__.py

@@ -2,10 +2,6 @@
 
 __docformat__ = 'restructuredtext'
 
-from datetime import datetime
-
-import numpy as np
-
 try:
     from . import hashtable, tslib, lib
 except Exception:  # pragma: no cover
@@ -19,6 +15,9 @@
     else:
         raise
 
+from datetime import datetime
+import numpy as np
+
 from pandas.version import version as __version__
 from pandas.info import __doc__
 

pandas/algos.pyx

@@ -44,7 +44,7 @@ cdef extern from "math.h":
     double sqrt(double x)
     double fabs(double)
 
-import lib
+from . import lib
 
 include "skiplist.pyx"
 

pandas/hashtable.pyx

@@ -18,8 +18,6 @@ cnp.import_ufunc()
 
 cdef int64_t iNaT = util.get_nat()
 
-from . import algos
-
 cdef extern from "datetime.h":
     bint PyDateTime_Check(object o)
     void PyDateTime_IMPORT()

pandas/index.pyx

@@ -13,14 +13,11 @@ cimport util
 
 import numpy as np
 
-import algos
-
 cimport tslib
-from tslib import Timestamp
-import tslib
-
 from hashtable cimport *
-import hashtable as _hash
+from . import algos, tslib, hashtable as _hash
+from .tslib import Timestamp
+
 
 from datetime cimport (get_datetime64_value, _pydatetime_to_dts,
                        pandas_datetimestruct)

pandas/tests/test_graphics.py

@@ -14,6 +14,14 @@
 from numpy.testing.decorators import slow
 import pandas.tools.plotting as plotting
 
+
+def _skip_if_no_scipy():
+    try:
+        import scipy
+    except ImportError:
+        raise nose.SkipTest
+
+
 class TestSeriesPlots(unittest.TestCase):
 
     @classmethod
@@ -136,6 +144,7 @@ def test_hist(self):
 
     @slow
     def test_kde(self):
+        _skip_if_no_scipy()
         _check_plot_works(self.ts.plot, kind='kde')
         _check_plot_works(self.ts.plot, kind='density')
         ax = self.ts.plot(kind='kde', logy=True)
@@ -380,6 +389,7 @@ def test_boxplot(self):
 
     @slow
     def test_kde(self):
+        _skip_if_no_scipy()
         df = DataFrame(np.random.randn(100, 4))
         _check_plot_works(df.plot, kind='kde')
         _check_plot_works(df.plot, kind='kde', subplots=True)
@@ -435,6 +445,8 @@ def test_hist(self):
 
     @slow
     def test_scatter(self):
+        _skip_if_no_scipy()
+
         df = DataFrame(np.random.randn(100, 4))
         import pandas.tools.plotting as plt
         def scat(**kwds):

pandas/tools/plotting.py

@@ -372,11 +372,15 @@ def bootstrap_plot(series, fig=None, size=50, samples=500, **kwds):
     import random
     import matplotlib
     import matplotlib.pyplot as plt
-    data = series.values
+
+    # random.sample(ndarray, int) fails on python 3.3, sigh
+    data = list(series.values)
     samplings = [random.sample(data, size) for _ in range(samples)]
+
     means = np.array([np.mean(sampling) for sampling in samplings])
     medians = np.array([np.median(sampling) for sampling in samplings])
-    midranges = np.array([(min(sampling) + max(sampling)) * 0.5 for sampling in samplings])
+    midranges = np.array([(min(sampling) + max(sampling)) * 0.5
+                          for sampling in samplings])
     if fig == None:
         fig = plt.figure()
     x = range(samples)

pandas/tseries/tests/test_plotting.py

@@ -18,6 +18,14 @@
 from pandas.util.testing import assert_series_equal
 import pandas.util.testing as tm
 
+
+def _skip_if_no_scipy():
+    try:
+        import scipy
+    except ImportError:
+        raise nose.SkipTest
+
+
 class TestTSPlot(unittest.TestCase):
 
     @classmethod
@@ -530,6 +538,8 @@ def test_secondary_y_ts(self):
 
     @slow
     def test_secondary_kde(self):
+        _skip_if_no_scipy()
+
         import matplotlib.pyplot as plt
         plt.close('all')
         ser = Series(np.random.randn(10))

pandas/tslib.pyx

@@ -1,8 +1,10 @@
 # cython: profile=False
-cimport numpy as np
 
+cimport numpy as np
 from numpy cimport (int32_t, int64_t, import_array, ndarray,
                     NPY_INT64, NPY_DATETIME)
+import numpy as np
+
 from cpython cimport *
 
 from libc.stdlib cimport free
@@ -14,7 +16,6 @@ from datetime cimport *
 from khash cimport *
 cimport cython
 
-import numpy as np
 from datetime import timedelta, datetime
 from dateutil.parser import parse as parse_date