change deprecated method setup -> setup_method, as CI fails in PR #29

sibirrer · Jan 28, 2024 · 3ae7cd8 · 3ae7cd8
1 parent 7472d42
commit 3ae7cd8
Show file tree

Hide file tree

Showing 38 changed files with 41 additions and 41 deletions.
diff --git a/test/test_Diagnostics/test_goodness_of_fit.py b/test/test_Diagnostics/test_goodness_of_fit.py
@@ -12,7 +12,7 @@
 
 
 class TestGoodnessOfFit(object):
-    def setup(self):
+    def setup_method(self):
         np.random.seed(seed=41)
         z_lens = 0.8
         z_source = 3.0

diff --git a/test/test_LensPosterior/test_anisotropy_config.py b/test/test_LensPosterior/test_anisotropy_config.py
@@ -4,7 +4,7 @@
 
 
 class TestAnisotropyConfig(object):
-    def setup(self):
+    def setup_method(self):
         self.r_eff = 2
         self.config_om = AnisotropyConfig(anisotropy_model="OM", r_eff=self.r_eff)
         self.config_gom = AnisotropyConfig(anisotropy_model="GOM", r_eff=self.r_eff)

diff --git a/test/test_LensPosterior/test_ddt_kin_constraints.py b/test/test_LensPosterior/test_ddt_kin_constraints.py
@@ -8,7 +8,7 @@
 
 
 class TestDdtKinGaussConstraints(object):
-    def setup(self):
+    def setup_method(self):
         pass
 
     def test_likelihoodconfiguration_om(self):

diff --git a/test/test_LensPosterior/test_ddt_kin_gauss_constraints.py b/test/test_LensPosterior/test_ddt_kin_gauss_constraints.py
@@ -8,7 +8,7 @@
 
 
 class TestDdtKinGaussConstraints(object):
-    def setup(self):
+    def setup_method(self):
         pass
 
     def test_likelihoodconfiguration_om(self):

diff --git a/test/test_LensPosterior/test_kin_constraints.py b/test/test_LensPosterior/test_kin_constraints.py
@@ -7,7 +7,7 @@
 
 
 class TestKinConstraints(object):
-    def setup(self):
+    def setup_method(self):
         pass
 
     def test_likelihoodconfiguration_om(self):

diff --git a/test/test_LensPosterior/test_kin_constraints_composite.py b/test/test_LensPosterior/test_kin_constraints_composite.py
@@ -9,7 +9,7 @@
 
 
 class TestKinConstraintsComposite(object):
-    def setup(self):
+    def setup_method(self):
         pass
 
     def test_likelihoodconfiguration_om(self):
@@ -260,7 +260,7 @@ def test_likelihoodconfiguration_gom(self):
 
 
 class TestKinConstraintsCompositeM2l(object):
-    def setup(self):
+    def setup_method(self):
         pass
 
     def test_likelihoodconfiguration_om(self):

diff --git a/test/test_Likelihood/test_KDELikelihood/test_KDE_likelihood.py b/test/test_Likelihood/test_KDELikelihood/test_KDE_likelihood.py
@@ -16,7 +16,7 @@
 
 
 class TestKDELikelihood(object):
-    def setup(self):
+    def setup_method(self):
         self.cosmo_params = ["h0", "om"]
         self.cosmology = "FLCDM"
         self.chain = import_Planck_chain(

diff --git a/test/test_Likelihood/test_LensLikelihood/test_base_lens_likelihood.py b/test/test_Likelihood/test_LensLikelihood/test_base_lens_likelihood.py
@@ -5,7 +5,7 @@
 
 
 class TestLensLikelihood(object):
-    def setup(self):
+    def setup_method(self):
         np.random.seed(seed=41)
         self.z_lens = 0.8
         self.z_source = 3.0

diff --git a/test/test_Likelihood/test_LensLikelihood/test_ddt_dd_gauss_likelihood.py b/test/test_Likelihood/test_LensLikelihood/test_ddt_dd_gauss_likelihood.py
@@ -5,7 +5,7 @@
 
 
 class TestDdtDdGaussianLikelihood(object):
-    def setup(self):
+    def setup_method(self):
         np.random.seed(seed=41)
         self.z_lens = 0.8
         self.z_source = 3.0

diff --git a/test/test_Likelihood/test_LensLikelihood/test_ddt_dd_kde_likelihood.py b/test/test_Likelihood/test_LensLikelihood/test_ddt_dd_kde_likelihood.py
@@ -8,7 +8,7 @@
 
 
 class TestDdtDdKDELikelihood(object):
-    def setup(self):
+    def setup_method(self):
         np.random.seed(seed=41)
         self.z_L = 0.8
         self.z_S = 3.0

diff --git a/test/test_Likelihood/test_LensLikelihood/test_ddt_gauss_kin_likelihood.py b/test/test_Likelihood/test_LensLikelihood/test_ddt_gauss_kin_likelihood.py
@@ -10,7 +10,7 @@
 
 
 class TestDdtGaussKinLikelihood(object):
-    def setup(self):
+    def setup_method(self):
         self.z_lens = 0.8
         self.z_source = 3.0
 

diff --git a/test/test_Likelihood/test_LensLikelihood/test_ddt_gauss_likelihood.py b/test/test_Likelihood/test_LensLikelihood/test_ddt_gauss_likelihood.py
@@ -5,7 +5,7 @@
 
 
 class TestDdtDdGaussianLikelihood(object):
-    def setup(self):
+    def setup_method(self):
         np.random.seed(seed=41)
         self.z_lens = 0.8
         self.z_source = 3.0

diff --git a/test/test_Likelihood/test_LensLikelihood/test_ddt_hist_kin_likelihood.py b/test/test_Likelihood/test_LensLikelihood/test_ddt_hist_kin_likelihood.py
@@ -10,7 +10,7 @@
 
 
 class TestDdtHistKinHist(object):
-    def setup(self):
+    def setup_method(self):
         self._ddt, self._dd = 2000.0, 1000.0
 
         self._sigma = 0.1

diff --git a/test/test_Likelihood/test_LensLikelihood/test_ddt_log_norm_likelihood.py b/test/test_Likelihood/test_LensLikelihood/test_ddt_log_norm_likelihood.py
@@ -8,7 +8,7 @@
 
 
 class TestTDLikelihoodLogNorm(object):
-    def setup(self):
+    def setup_method(self):
         self.z_L = 0.8
         self.z_S = 3.0
         self.ddt_mu = 3.5

diff --git a/test/test_Likelihood/test_LensLikelihood/test_double_source_plane.py b/test/test_Likelihood/test_LensLikelihood/test_double_source_plane.py
@@ -10,7 +10,7 @@
 class TestDSPLikelihood(object):
     """"""
 
-    def setup(self):
+    def setup_method(self):
         self.cosmo = FlatLambdaCDM(H0=70, Om0=0.3, Ob0=0.05)
         self.zl = 0.5
         self.zs1 = 1

diff --git a/test/test_Likelihood/test_LensLikelihood/test_ds_dds_gauss_likelihood.py b/test/test_Likelihood/test_LensLikelihood/test_ds_dds_gauss_likelihood.py
@@ -7,7 +7,7 @@
 
 
 class TestDdtDdGaussianLikelihood(object):
-    def setup(self):
+    def setup_method(self):
         np.random.seed(seed=41)
         self.z_lens = 0.8
         self.z_source = 3.0

diff --git a/test/test_Likelihood/test_LensLikelihood/test_kin_likelihood.py b/test/test_Likelihood/test_LensLikelihood/test_kin_likelihood.py
@@ -7,7 +7,7 @@
 
 
 class TestKinLikelihood(object):
-    def setup(self):
+    def setup_method(self):
         np.random.seed(seed=41)
 
     def test_log_likelihood(self):

diff --git a/test/test_Likelihood/test_LensLikelihood/test_mag_likelihood.py b/test/test_Likelihood/test_LensLikelihood/test_mag_likelihood.py
@@ -6,7 +6,7 @@
 
 
 class TestMagnificationLikelihood(object):
-    def setup(self):
+    def setup_method(self):
         pass
 
     def test_log_likelihood(self):

diff --git a/test/test_Likelihood/test_LensLikelihood/test_td_mag_likelihood.py b/test/test_Likelihood/test_LensLikelihood/test_td_mag_likelihood.py
@@ -7,7 +7,7 @@
 
 
 class TestMagnificationLikelihood(object):
-    def setup(self):
+    def setup_method(self):
         pass
 
     def test_log_likelihood(self):

diff --git a/test/test_Likelihood/test_LensLikelihood/test_td_mag_magnitude_likelihood.py b/test/test_Likelihood/test_LensLikelihood/test_td_mag_magnitude_likelihood.py
@@ -10,7 +10,7 @@
 
 
 class TestMagnificationLikelihood(object):
-    def setup(self):
+    def setup_method(self):
         pass
 
     def test_log_likelihood(self):

diff --git a/test/test_Likelihood/test_SneLikelihood/test_pantheon_plus_data.py b/test/test_Likelihood/test_SneLikelihood/test_pantheon_plus_data.py
@@ -5,7 +5,7 @@
 
 
 class TestPantheonPlusData(object):
-    def setup(self):
+    def setup_method(self):
         pass
 
     def test_import(self):

diff --git a/test/test_Likelihood/test_SneLikelihood/test_sne_likelihood.py b/test/test_Likelihood/test_SneLikelihood/test_sne_likelihood.py
@@ -5,7 +5,7 @@
 
 
 class TestSnePantheon(object):
-    def setup(self):
+    def setup_method(self):
         np.random.seed(42)
         # define redshifts
         num = 30  # number of Sne

diff --git a/test/test_Likelihood/test_SneLikelihood/test_sne_likelihood_custom.py b/test/test_Likelihood/test_SneLikelihood/test_sne_likelihood_custom.py
@@ -5,7 +5,7 @@
 
 
 class TestCustomSneLikelihood(object):
-    def setup(self):
+    def setup_method(self):
         np.random.seed(42)
         # define redshifts
         num = 30  # number of Sne

diff --git a/test/test_Likelihood/test_SneLikelihood/test_sne_likelihood_from_file.py b/test/test_Likelihood/test_SneLikelihood/test_sne_likelihood_from_file.py
@@ -11,7 +11,7 @@
 
 
 class TestSneLikelihoodFromFile(object):
-    def setup(self):
+    def setup_method(self):
         self.pantheon_binned_likelihood = SneLikelihoodFromFile(
             sample_name="Pantheon_binned"
         )

diff --git a/test/test_Likelihood/test_cosmo_likelihood.py b/test/test_Likelihood/test_cosmo_likelihood.py
@@ -10,7 +10,7 @@
 
 
 class TestCosmoLikelihood(object):
-    def setup(self):
+    def setup_method(self):
         np.random.seed(seed=41)
         self.z_L = 0.8
         self.z_S = 3.0

diff --git a/test/test_Likelihood/test_hierarchy_likelihood.py b/test/test_Likelihood/test_hierarchy_likelihood.py
@@ -7,7 +7,7 @@
 
 
 class TestLensLikelihood(object):
-    def setup(self):
+    def setup_method(self):
         z_lens = 0.5
         z_source = 1.5
         self.cosmo = FlatLambdaCDM(H0=70, Om0=0.3, Ob0=0.05)

diff --git a/test/test_Likelihood/test_lens_sample_likelihood.py b/test/test_Likelihood/test_lens_sample_likelihood.py
@@ -10,7 +10,7 @@
 
 
 class TestLensLikelihood(object):
-    def setup(self):
+    def setup_method(self):
         np.random.seed(seed=41)
         self.z_L = 0.8
         self.z_S = 3.0

diff --git a/test/test_Likelihood/test_parameter_scaling.py b/test/test_Likelihood/test_parameter_scaling.py
@@ -8,7 +8,7 @@
 
 
 class TestParameterScalingSingleAperture(object):
-    def setup(self):
+    def setup_method(self):
         ani_param_array = np.linspace(start=0, stop=1, num=10)
         param_scaling_array = ani_param_array * 2
         self.scaling = ParameterScalingSingleAperture(
@@ -77,7 +77,7 @@ def test_param_scaling(self):
 
 
 class TestParameterScalingIFU(object):
-    def setup(self):
+    def setup_method(self):
         ani_param_array = np.linspace(start=0, stop=1, num=10)
         param_scaling_array = ani_param_array * 2
         self.scaling = ParameterScalingIFU(

diff --git a/test/test_Likelihood/test_transform_cosmography.py b/test/test_Likelihood/test_transform_cosmography.py
@@ -5,7 +5,7 @@
 
 
 class TestTransformedCoismography(object):
-    def setup(self):
+    def setup_method(self):
         z_lens = 0.5
         z_source = 1.5
         self.transform = TransformedCosmography(z_lens=z_lens, z_source=z_source)

diff --git a/test/test_Sampling/test_ParamManager/test_cosmo_param.py b/test/test_Sampling/test_ParamManager/test_cosmo_param.py
@@ -5,7 +5,7 @@
 
 
 class TestCosmoParamFLCDM(object):
-    def setup(self):
+    def setup_method(self):
         cosmology_list = ["FLCDM", "FwCDM", "w0waCDM", "oLCDM", "NONE"]
         kwargs_fixed = {
             "h0": 70,

diff --git a/test/test_Sampling/test_ParamManager/test_kin_param.py b/test/test_Sampling/test_ParamManager/test_kin_param.py
@@ -4,7 +4,7 @@
 
 
 class TestKinParam(object):
-    def setup(self):
+    def setup_method(self):
         self._param = KinParam(
             anisotropy_sampling=True,
             anisotropy_model="GOM",

diff --git a/test/test_Sampling/test_ParamManager/test_lens_param.py b/test/test_Sampling/test_ParamManager/test_lens_param.py
@@ -3,7 +3,7 @@
 
 
 class TestLensParam(object):
-    def setup(self):
+    def setup_method(self):
         self._param = LensParam(
             lambda_mst_sampling=True,
             lambda_mst_distribution="GAUSSIAN",
@@ -94,7 +94,7 @@ def test_args2kwargs(self):
 
 
 class TestLensParamGammaInnerM2l(object):
-    def setup(self):
+    def setup_method(self):
         self._param = LensParam(
             gamma_in_sampling=True,
             gamma_in_distribution="GAUSSIAN",

diff --git a/test/test_Sampling/test_ParamManager/test_param_manager.py b/test/test_Sampling/test_ParamManager/test_param_manager.py
@@ -5,7 +5,7 @@
 
 
 class TestParamManager(object):
-    def setup(self):
+    def setup_method(self):
         cosmology_list = ["FLCDM", "FwCDM", "w0waCDM", "oLCDM"]
         kwargs_lower_cosmo = {
             "h0": 10,

diff --git a/test/test_Sampling/test_ParamManager/test_source_param.py b/test/test_Sampling/test_ParamManager/test_source_param.py
@@ -5,7 +5,7 @@
 
 
 class TestSourceParam(object):
-    def setup(self):
+    def setup_method(self):
         self._param = SourceParam(
             sne_distribution="GAUSSIAN", sne_apparent_m_sampling=True, kwargs_fixed=None
         )

diff --git a/test/test_Sampling/test_mcmc_sampling.py b/test/test_Sampling/test_mcmc_sampling.py
@@ -9,7 +9,7 @@
 
 
 class TestMCMCSampling(object):
-    def setup(self):
+    def setup_method(self):
         np.random.seed(seed=41)
         self.z_L = 0.8
         self.z_S = 3.0

diff --git a/test/test_Util/test_distribution_util.py b/test/test_Util/test_distribution_util.py
@@ -7,7 +7,7 @@
 
 
 class TestProbDensity(object):
-    def setup(self):
+    def setup_method(self):
         np.random.seed(seed=42)
 
     def gauss(self, x, simga):

diff --git a/test/test_Util/test_ifu_util.py b/test/test_Util/test_ifu_util.py
@@ -7,7 +7,7 @@
 
 
 class TestIFUUtil(object):
-    def setup(self):
+    def setup_method(self):
         pass
 
     def test_radial_dispersion(self):

diff --git a/test/test_Util/test_likelihood_util.py b/test/test_Util/test_likelihood_util.py
@@ -7,7 +7,7 @@
 
 
 class TestLikelihoodUtil(object):
-    def setup(self):
+    def setup_method(self):
         pass
 
     def test_get_truncated_normal(self):