Merge pull request #435 from grlee77/cython_language_level

BLD: set language_level=3 for Cython

Author: rgommers

pywt/_extensions/_cwt.pyx

@@ -1,6 +1,7 @@
 #cython: boundscheck=False, wraparound=False
-cimport common, c_wt
-from common cimport pywt_index_t, MODE
+from . cimport common
+from . cimport c_wt
+from .common cimport pywt_index_t, MODE
 from ._pywt cimport _check_dtype
 
 cimport numpy as np

pywt/_extensions/_dwt.pyx

@@ -1,6 +1,7 @@
 #cython: boundscheck=False, wraparound=False
-cimport common, c_wt
-from common cimport pywt_index_t, MODE
+from . cimport common
+from . cimport c_wt
+from .common cimport pywt_index_t, MODE
 from ._pywt cimport _check_dtype
 
 cimport numpy as np

pywt/_extensions/_pywt.pxd

@@ -1,4 +1,4 @@
-cimport wavelet
+from . cimport wavelet
 cimport numpy as np
 include "config.pxi"
 

pywt/_extensions/_pywt.pyx

@@ -1,5 +1,5 @@
 # Copyright (c) 2006-2012 Filip Wasilewski <http://en.ig.ma/>
-# Copyright (c) 2012-2016 The PyWavelets Developers
+# Copyright (c) 2012-2018 The PyWavelets Developers
 #                         <https://github.com/PyWavelets/pywt>
 # See COPYING for license details.
 
@@ -11,8 +11,8 @@ __all__ = ['MODES', 'Modes', 'DiscreteContinuousWavelet', 'Wavelet',
 import warnings
 import re
 
-cimport c_wt
-cimport common
+from . cimport c_wt
+from . cimport common
 from ._dwt cimport upcoef
 from ._cwt cimport cwt_psi_single
 
@@ -1044,7 +1044,7 @@ cpdef np.dtype _check_dtype(data):
 def keep(arr, keep_length):
     length = len(arr)
     if keep_length < length:
-        left_bound = (length - keep_length) / 2
+        left_bound = (length - keep_length) // 2
         return arr[left_bound:left_bound + keep_length]
     return arr
 

pywt/_extensions/_swt.pyx

@@ -1,12 +1,12 @@
 #cython: boundscheck=False, wraparound=False
-cimport common
-cimport c_wt
+from . cimport common
+from . cimport c_wt
 
 import warnings
 import numpy as np
 cimport numpy as np
 
-from common cimport pywt_index_t
+from .common cimport pywt_index_t
 from ._pywt cimport c_wavelet_from_object, cdata_t, Wavelet, _check_dtype
 
 include "config.pxi"

pywt/_extensions/c_wt.pxd

@@ -3,9 +3,9 @@
 #                         <https://github.com/PyWavelets/pywt>
 # See COPYING for license details.
 
-from common cimport (MODE, pywt_index_t, ArrayInfo, Coefficient,
-                     DiscreteTransformType)
-from wavelet cimport DiscreteWavelet, ContinuousWavelet
+from .common cimport (MODE, pywt_index_t, ArrayInfo, Coefficient,
+                      DiscreteTransformType)
+from .wavelet cimport DiscreteWavelet, ContinuousWavelet
 
 include "config.pxi"
 

pywt/_extensions/wavelet.pxd

@@ -1,4 +1,4 @@
-from common cimport pywt_index_t
+from .common cimport pywt_index_t
 
 cdef extern from "c/wavelets.h":
     ctypedef enum SYMMETRY:

setup.py

@@ -162,8 +162,7 @@ def get_cython_sources(use_cython):
     for k, v in py_defines.items():
         fd.write('%s = %d\n' % (k, int(v)))
 
-
-cythonize_opts = {}
+cythonize_opts = {'language_level': '3'}
 if os.environ.get("CYTHON_TRACE"):
     cythonize_opts['linetrace'] = True
     cython_macros.append(("CYTHON_TRACE_NOGIL", 1))