Use proper relative imports

Author: markchil

eqtools/__init__.py

@@ -22,12 +22,12 @@
 __version__ = '1.4.0'
 
 from .core import *
-from .EFIT import *
-from .CModEFIT import *
-from .AUGData import *
-from .NSTXEFIT import *
-from .D3DEFIT import *
-from .eqdskreader import *
-from .pfilereader import *
-from .FromArrays import *
-from .TCVLIUQE import *
+# from .EFIT import *
+# from .CModEFIT import *
+# from .AUGData import *
+# from .NSTXEFIT import *
+# from .D3DEFIT import *
+# from .eqdskreader import *
+# from .pfilereader import *
+# from .FromArrays import *
+# from .TCVLIUQE import *

eqtools/core.py

@@ -42,7 +42,7 @@ class ModuleWarning(Warning):
 
 
 try:
-    import trispline
+    from . import trispline
     _has_trispline = True
 except ImportError:
     warnings.warn("trispline module could not be loaded -- tricubic spline "

eqtools/filewriter.py

@@ -23,7 +23,7 @@
 import core
 import matplotlib.pyplot as plt
 try:
-    import trispline
+    from . import trispline
     _has_trispline = True
 except ImportError:
     warnings.warn("trispline module could not be loaded -- tricubic spline "

eqtools/trispline.py

@@ -25,7 +25,7 @@
 import scipy
 import scipy.interpolate
 try:
-    import _tricub
+    from . import _tricub
 except Exception:
     # Won't be able to use actual trispline, but still can use other routines.
     pass

setup.py

@@ -1,26 +1,19 @@
-try:
-    from numpy.distutils.core import setup, Extension
-except ImportError:
-    import warnings
-    warnings.warn("numpy not installed, defaulting to setuptools.")
-    try:
-        from setuptools import setup, Extension
-    except ImportError:
-        warnings.warn("setuptools not installed, defaulting to distutils.")
-        from distutils.core import setup, Extension
+from numpy.distutils.core import setup, Extension
 
-tricub = Extension('eqtools._tricub',['eqtools/_tricub.pyf','eqtools/_tricub.c'])
+tricub = Extension(
+    'eqtools._tricub', ['eqtools/_tricub.pyf', 'eqtools/_tricub.c']
+)
 
 setup(
     name='eqtools',
     version='1.4.0',
-    packages=['eqtools',],
+    packages=['eqtools'],
     install_requires=['scipy', 'numpy', 'matplotlib'],
     author=['Mark Chilenski', 'Ian Faust', 'John Walk'],
     author_email='psfcplasmatools@mit.edu',
     url='https://github.com/PSFCPlasmaTools/eqtools/',
     description='Python tools for magnetic equilibria in tokamak plasmas',
     long_description=open('README.md', 'r').read(),
-    ext_modules=[tricub,],
+    ext_modules=[tricub],
     license='GPL'
 )