Changed the import structure

test/detector_tests.py

-from context import tupak
-from tupak import detector
+from __future__ import absolute_import
+from test.context import tupak
 import unittest
 import mock
 from mock import MagicMock
@@ -23,7 +23,7 @@ class TestDetector(unittest.TestCase):
         self.xarm_tilt = 0.
         self.yarm_tilt = 0.
         # noinspection PyTypeChecker
-        self.ifo = detector.Interferometer(name=self.name, power_spectral_density=self.power_spectral_density,
+        self.ifo = tupak.detector.Interferometer(name=self.name, power_spectral_density=self.power_spectral_density,
                                            minimum_frequency=self.minimum_frequency,
                                            maximum_frequency=self.maximum_frequency, length=self.length,
                                            latitude=self.latitude, longitude=self.longitude, elevation=self.elevation,

test/example_tests.py

+from __future__ import absolute_import
 import unittest
 import os
 import shutil
@@ -5,7 +6,7 @@ import logging
 
 # Required to run the tests
 from past.builtins import execfile
-from context import tupak
+from test.context import tupak
 import numpy as np
 
 tupak.utils.command_line_args.test = True

test/make_standard_data.py

@@ -4,7 +4,7 @@ import os
 
 import numpy as np
 
-import tupak
+from test.context import tupak
 from tupak.waveform_generator import WaveformGenerator
 
 np.random.seed(10)

test/noise_realisation_tests.py

+from __future__ import absolute_import
 import numpy as np
 import unittest
-from context import tupak
+from test.context import tupak
 
 
 class TestNoiseRealisation(unittest.TestCase):

test/prior_tests.py

-from context import tupak
+from __future__ import absolute_import
+from test.context import tupak
 import unittest
 from mock import Mock
 import numpy as np

test/sampler_tests.py

-from context import tupak
+from __future__ import absolute_import
+from test.context import tupak
 from tupak import prior
 from tupak.result import Result
 import unittest

test/tests.py

+from __future__ import absolute_import
+
+import os
 import unittest
+
 import numpy as np
-import os
-import shutil
-from context import tupak
-import logging
 from past.builtins import execfile
 
+from test.context import tupak
+
 
 class Test(unittest.TestCase):
     outdir = './outdir'

test/waveform_generator_tests.py

+from __future__ import absolute_import
 import unittest
-from context import tupak
+from test.context import tupak
 import numpy as np
 
 
@@ -18,13 +19,14 @@ def gaussian_frequency_domain_strain_2(frequency_array, a, m, s, ra, dec, geocen
 class TestWaveformGeneratorInstantiationWithoutOptionalParameters(unittest.TestCase):
 
     def setUp(self):
-        self.waveform_generator = tupak.waveform_generator.WaveformGenerator(1, 4096,
-                                                                             frequency_domain_source_model=gaussian_frequency_domain_strain)
+        self.waveform_generator = \
+            tupak.waveform_generator.WaveformGenerator(1, 4096,
+                                                       frequency_domain_source_model=gaussian_frequency_domain_strain)
         self.simulation_parameters = dict(amplitude=1e-21, mu=100, sigma=1,
-                                     ra=1.375,
-                                     dec=-1.2108,
-                                     geocent_time=1126259642.413,
-                                     psi=2.659)
+                                          ra=1.375,
+                                          dec=-1.2108,
+                                          geocent_time=1126259642.413,
+                                          psi=2.659)
 
     def tearDown(self):
         del self.waveform_generator
@@ -46,20 +48,20 @@ class TestWaveformGeneratorInstantiationWithoutOptionalParameters(unittest.TestC
         self.assertIsInstance(self.waveform_generator.time_array, np.ndarray)
 
     def test_source_model_parameters(self):
-        params = self.simulation_parameters.keys()
-        self.assertItemsEqual(self.waveform_generator.parameters, params)
+        self.assertListEqual(list(self.waveform_generator.parameters.keys()), list(self.simulation_parameters.keys()))
 
 
 class TestParameterSetter(unittest.TestCase):
 
     def setUp(self):
-        self.waveform_generator = tupak.waveform_generator.WaveformGenerator(1, 4096,
-                                                                             frequency_domain_source_model=gaussian_frequency_domain_strain)
+        self.waveform_generator = \
+            tupak.waveform_generator.WaveformGenerator(1, 4096,
+                                                       frequency_domain_source_model=gaussian_frequency_domain_strain)
         self.simulation_parameters = dict(amplitude=1e-21, mu=100, sigma=1,
-                                     ra=1.375,
-                                     dec=-1.2108,
-                                     geocent_time=1126259642.413,
-                                     psi=2.659)
+                                          ra=1.375,
+                                          dec=-1.2108,
+                                          geocent_time=1126259642.413,
+                                          psi=2.659)
 
     def tearDown(self):
         del self.waveform_generator
@@ -72,7 +74,7 @@ class TestParameterSetter(unittest.TestCase):
 
     def test_parameter_setter_none_handling(self):
         self.waveform_generator.parameters = None
-        self.assertItemsEqual(self.waveform_generator.parameters.keys(), self.simulation_parameters.keys())
+        self.assertSequenceEqual(self.waveform_generator.parameters.keys(), self.simulation_parameters.keys())
 
 
 class TestSourceModelSetter(unittest.TestCase):
@@ -82,17 +84,17 @@ class TestSourceModelSetter(unittest.TestCase):
                                                                              frequency_domain_source_model=gaussian_frequency_domain_strain)
         self.waveform_generator.frequency_domain_source_model = gaussian_frequency_domain_strain_2
         self.simulation_parameters = dict(amplitude=1e-21, mu=100, sigma=1,
-                                     ra=1.375,
-                                     dec=-1.2108,
-                                     geocent_time=1126259642.413,
-                                     psi=2.659)
+                                          ra=1.375,
+                                          dec=-1.2108,
+                                          geocent_time=1126259642.413,
+                                          psi=2.659)
 
     def tearDown(self):
         del self.waveform_generator
         del self.simulation_parameters
 
     def test_parameters_are_set_correctly(self):
-        self.assertItemsEqual(self.waveform_generator.parameters, self.simulation_parameters.keys())
+        self.assertListEqual(list(self.waveform_generator.parameters.keys()), list(self.simulation_parameters.keys()))
 
 
 if __name__ == '__main__':