merge master

nifty/plotting/colormap/colormap.py

 from __future__ import division
 from builtins import str
-from nifty.plotting.plotly_wrapper import PlotlyWrapper
+from ..plotly_wrapper import PlotlyWrapper
 
 
 class Colormap(PlotlyWrapper):

nifty/plotting/colormap/colormaps.py

-from nifty.plotting.colormap.colormap import Colormap
+from ..colormap.colormap import Colormap
 
 
 def HighEnergyCmap():

nifty/plotting/descriptors/axis.py

 # -*- coding: utf-8 -*-
 
-from nifty.plotting.plotly_wrapper import PlotlyWrapper
+from ..plotly_wrapper import PlotlyWrapper
 
 
 class Axis(PlotlyWrapper):

nifty/plotting/descriptors/line.py

 # -*- coding: utf-8 -*-
 
-from nifty.plotting.plotly_wrapper import PlotlyWrapper
+from ..plotly_wrapper import PlotlyWrapper
 
 
 class Line(PlotlyWrapper):

nifty/plotting/descriptors/marker.py

 # -*- coding: utf-8 -*-
 
-from nifty.plotting.plotly_wrapper import PlotlyWrapper
+from ..plotly_wrapper import PlotlyWrapper
 
 
 class Marker(PlotlyWrapper):

nifty/plotting/figures/figure_2D.py

 # -*- coding: utf-8 -*-
 
 from .figure_from_plot import FigureFromPlot
-from nifty.plotting.plots import Heatmap, HPMollweide, GLMollweide
+from ..plots import Heatmap, HPMollweide, GLMollweide
 
 
 class Figure2D(FigureFromPlot):

nifty/plotting/figures/figure_base.py

@@ -2,7 +2,7 @@
 
 import abc
 
-from nifty.plotting.plotly_wrapper import PlotlyWrapper
+from ..plotly_wrapper import PlotlyWrapper
 
 
 class FigureBase(PlotlyWrapper):

nifty/plotting/figures/multi_figure.py

@@ -3,7 +3,7 @@
 from builtins import map
 from builtins import str
 import numpy as np
-from nifty import dependency_injector as gdi
+from ... import dependency_injector as gdi
 from .figure_base import FigureBase
 from .figure_3D import Figure3D
 

nifty/plotting/plotly_wrapper.py

 from builtins import object
 from abc import ABCMeta, abstractmethod
-from nifty.nifty_meta import NiftyMeta
+from ..nifty_meta import NiftyMeta
 from future.utils import with_metaclass
 
 

nifty/plotting/plots/heatmaps/glmollweide.py

 # -*- coding: utf-8 -*-
 
-from nifty import dependency_injector as gdi
+from .... import dependency_injector as gdi
 from .heatmap import Heatmap
 import numpy as np
 
-from nifty.plotting.descriptors import Axis
+from ...descriptors import Axis
 
 from .mollweide_helper import mollweide_helper
 

nifty/plotting/plots/heatmaps/heatmap.py

@@ -2,9 +2,9 @@
 
 import numpy as np
 
-from nifty.plotting.descriptors import Axis
-from nifty.plotting.colormap import Colormap
-from nifty.plotting.plotly_wrapper import PlotlyWrapper
+from ...descriptors import Axis
+from ...colormap import Colormap
+from ...plotly_wrapper import PlotlyWrapper
 
 
 class Heatmap(PlotlyWrapper):

nifty/plotting/plots/heatmaps/hpmollweide.py

 # -*- coding: utf-8 -*-
 
 from __future__ import division
-from nifty import dependency_injector as gdi
+from .... import dependency_injector as gdi
 from .heatmap import Heatmap
 import numpy as np
 
-from nifty.plotting.descriptors import Axis
+from ...descriptors import Axis
 
 from .mollweide_helper import mollweide_helper
 

nifty/plotting/plots/scatter_plots/scatter_plot.py

 # -*- coding: utf-8 -*-
 
 import abc
-from nifty.plotting.plotly_wrapper import PlotlyWrapper
-from nifty.plotting.descriptors import Marker,\
-                                       Line
+from ...plotly_wrapper import PlotlyWrapper
+from ...descriptors import Marker,\
+                           Line
 
 
 class ScatterPlot(PlotlyWrapper):

nifty/plotting/plotter/gl_plotter.py

 
 import numpy as np
 
-from nifty.spaces import GLSpace
+from ...spaces import GLSpace
 
-from nifty.plotting.figures import Figure2D
-from nifty.plotting.plots import GLMollweide
+from ..figures import Figure2D
+from ..plots import GLMollweide
 from .plotter_base import PlotterBase
 
 

nifty/plotting/plotter/healpix_plotter.py

-from nifty.spaces import HPSpace
+from ...spaces import HPSpace
 
-from nifty.plotting.figures import Figure2D
-from nifty.plotting.plots import HPMollweide
+from ..figures import Figure2D
+from ..plots import HPMollweide
 from .plotter_base import PlotterBase
 
 

nifty/plotting/plotter/plotter_base.py

@@ -13,13 +13,13 @@ import d2o
 
 from keepers import Loggable
 
-from nifty.config import dependency_injector as gdi
+from ...config import dependency_injector as gdi
 
-from nifty.spaces.space import Space
-from nifty.field import Field
-import nifty.nifty_utilities as utilities
+from ...spaces.space import Space
+from ...field import Field
+from ... import nifty_utilities as utilities
 
-from nifty.plotting.figures import MultiFigure
+from ..figures import MultiFigure
 from future.utils import with_metaclass
 
 plotly = gdi.get('plotly')

nifty/plotting/plotter/power_plotter.py

@@ -2,11 +2,11 @@
 
 import numpy as np
 
-from nifty.spaces import PowerSpace
+from ...spaces import PowerSpace
 
-from nifty.plotting.descriptors import Axis
-from nifty.plotting.figures import Figure2D
-from nifty.plotting.plots import Cartesian2D
+from ..descriptors import Axis
+from ..figures import Figure2D
+from ..plots import Cartesian2D
 from .plotter_base import PlotterBase
 
 

nifty/plotting/plotter/rg1d_plotter.py

@@ -3,11 +3,11 @@
 from __future__ import division
 import numpy as np
 
-from nifty.spaces import RGSpace
+from ...spaces import RGSpace
 
-from nifty.plotting.descriptors import Axis
-from nifty.plotting.figures import Figure2D
-from nifty.plotting.plots import Cartesian2D
+from ..descriptors import Axis
+from ..figures import Figure2D
+from ..plots import Cartesian2D
 from .plotter_base import PlotterBase
 
 

nifty/plotting/plotter/rg2d_plotter.py

 # -*- coding: utf-8 -*-
 
 
-from nifty.spaces import RGSpace
-from nifty.plotting.figures import Figure2D
-from nifty.plotting.plots import Heatmap
+from ...spaces import RGSpace
+from ..figures import Figure2D
+from ..plots import Heatmap
 from .plotter_base import PlotterBase
 
 

nifty/probing/prober/prober.py

@@ -21,10 +21,9 @@ from builtins import range
 from builtins import object
 import numpy as np
 
-from nifty.field import Field
-import nifty.nifty_utilities as utilities
-
-from nifty import nifty_configuration as nc
+from ...field import Field
+from ... import nifty_utilities as utilities
+from ... import nifty_configuration as nc
 
 from d2o import STRATEGIES as DISTRIBUTION_STRATEGIES