From 0cd48ebe914162565ca8ec782d9b117a3ba2541d Mon Sep 17 00:00:00 2001 From: Colm Talbot <colm.talbot@ligo.org> Date: Tue, 12 Jan 2021 02:09:44 -0600 Subject: [PATCH] remove future imports --- bilby/__init__.py | 1 - bilby/core/__init__.py | 1 - bilby/core/grid.py | 2 -- bilby/core/likelihood.py | 1 - bilby/core/prior/dict.py | 3 +-- bilby/core/result.py | 2 -- bilby/core/sampler/base_sampler.py | 1 - bilby/core/sampler/cpnest.py | 1 - bilby/core/sampler/dynamic_dynesty.py | 1 - bilby/core/sampler/fake_sampler.py | 1 - bilby/core/sampler/nestle.py | 1 - bilby/core/sampler/polychord.py | 1 - bilby/core/sampler/ptemcee.py | 1 - bilby/core/sampler/ptmcmc.py | 1 - bilby/core/sampler/pymc3.py | 1 - bilby/core/sampler/ultranest.py | 1 - bilby/core/utils.py | 1 - bilby/gw/likelihood.py | 1 - bilby/gw/result.py | 1 - bilby/gw/sampler/__init__.py | 1 - bilby/gw/utils.py | 1 - bilby/hyper/likelihood.py | 1 - cli_bilby/__init__.py | 1 - examples/core_examples/gaussian_example.py | 1 - examples/core_examples/grid_example.py | 1 - examples/core_examples/hyper_parameter_example.py | 1 - examples/core_examples/linear_regression.py | 1 - examples/core_examples/linear_regression_grid.py | 1 - examples/core_examples/linear_regression_pymc3.py | 1 - .../core_examples/linear_regression_pymc3_custom_likelihood.py | 1 - examples/core_examples/linear_regression_unknown_noise.py | 1 - examples/core_examples/multidimensional_gaussian.py | 1 - examples/core_examples/multivariate_gaussian_prior.py | 1 - examples/core_examples/occam_factor_example.py | 1 - examples/core_examples/radioactive_decay.py | 1 - .../core_examples/starting_mcmc_chains_near_to_the_peak.py | 1 - examples/gw_examples/data_examples/GW150914.py | 1 - examples/gw_examples/data_examples/GW150914_advanced.py | 1 - examples/gw_examples/data_examples/GW170817.py | 1 - examples/gw_examples/data_examples/get_LOSC_event_data.py | 1 - examples/gw_examples/injection_examples/australian_detector.py | 1 - .../injection_examples/binary_neutron_star_example.py | 1 - examples/gw_examples/injection_examples/bns_eos_example.py | 1 - examples/gw_examples/injection_examples/calibration_example.py | 1 - .../injection_examples/change_sampled_parameters.py | 1 - .../injection_examples/create_your_own_source_model.py | 1 - .../gw_examples/injection_examples/custom_proposal_example.py | 1 - examples/gw_examples/injection_examples/eccentric_inspiral.py | 1 - .../gw_examples/injection_examples/fake_sampler_example.py | 1 - examples/gw_examples/injection_examples/fast_tutorial.py | 1 - .../gw_examples/injection_examples/how_to_specify_the_prior.py | 1 - .../gw_examples/injection_examples/marginalized_likelihood.py | 1 - examples/gw_examples/injection_examples/non_tensor.py | 1 - examples/gw_examples/injection_examples/plot_skymap.py | 1 - .../gw_examples/injection_examples/plot_time_domain_data.py | 1 - examples/gw_examples/injection_examples/roq_example.py | 1 - .../gw_examples/injection_examples/sine_gaussian_example.py | 1 - .../injection_examples/standard_15d_cbc_tutorial.py | 1 - examples/gw_examples/injection_examples/using_gwin.py | 1 - examples/gw_examples/supernova_example/supernova_example.py | 1 - requirements.txt | 1 - setup.py | 1 - test/core/prior/prior_test.py | 1 - 63 files changed, 1 insertion(+), 66 deletions(-) diff --git a/bilby/__init__.py b/bilby/__init__.py index 4b6ac0f52..30e2531b5 100644 --- a/bilby/__init__.py +++ b/bilby/__init__.py @@ -16,7 +16,6 @@ https://lscsoft.docs.ligo.org/bilby/installation.html. """ -from __future__ import absolute_import import sys from . import core, gw, hyper diff --git a/bilby/core/__init__.py b/bilby/core/__init__.py index 3946f24a4..7446bd24f 100644 --- a/bilby/core/__init__.py +++ b/bilby/core/__init__.py @@ -1,2 +1 @@ -from __future__ import absolute_import from . import grid, likelihood, prior, result, sampler, series, utils diff --git a/bilby/core/grid.py b/bilby/core/grid.py index 42fb58dd0..c469464bd 100644 --- a/bilby/core/grid.py +++ b/bilby/core/grid.py @@ -1,5 +1,3 @@ -from __future__ import division - import numpy as np import os import json diff --git a/bilby/core/likelihood.py b/bilby/core/likelihood.py index 3441a1a6d..06438a21e 100644 --- a/bilby/core/likelihood.py +++ b/bilby/core/likelihood.py @@ -1,4 +1,3 @@ -from __future__ import division, print_function import copy import numpy as np diff --git a/bilby/core/prior/dict.py b/bilby/core/prior/dict.py index 3ec1a0593..3d4371a92 100644 --- a/bilby/core/prior/dict.py +++ b/bilby/core/prior/dict.py @@ -3,7 +3,6 @@ from io import open as ioopen import json import os -from future.utils import iteritems from matplotlib.cbook import flatten import numpy as np @@ -185,7 +184,7 @@ class PriorDict(dict): def from_dictionary(self, dictionary): eval_dict = dict(inf=np.inf) - for key, val in iteritems(dictionary): + for key, val in dictionary.items(): if isinstance(val, Prior): continue elif isinstance(val, (int, float)): diff --git a/bilby/core/result.py b/bilby/core/result.py index 9964ee5ca..e2855797a 100644 --- a/bilby/core/result.py +++ b/bilby/core/result.py @@ -1,5 +1,3 @@ -from __future__ import division - import inspect import os from collections import OrderedDict, namedtuple diff --git a/bilby/core/sampler/base_sampler.py b/bilby/core/sampler/base_sampler.py index fa05b4f83..7d8d4b4db 100644 --- a/bilby/core/sampler/base_sampler.py +++ b/bilby/core/sampler/base_sampler.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import datetime import distutils.dir_util import numpy as np diff --git a/bilby/core/sampler/cpnest.py b/bilby/core/sampler/cpnest.py index fa58e5d66..a1c1ab087 100644 --- a/bilby/core/sampler/cpnest.py +++ b/bilby/core/sampler/cpnest.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import array import copy diff --git a/bilby/core/sampler/dynamic_dynesty.py b/bilby/core/sampler/dynamic_dynesty.py index 48d726e4a..c2b143e10 100644 --- a/bilby/core/sampler/dynamic_dynesty.py +++ b/bilby/core/sampler/dynamic_dynesty.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import os import dill as pickle diff --git a/bilby/core/sampler/fake_sampler.py b/bilby/core/sampler/fake_sampler.py index 8033958dd..55015eef6 100644 --- a/bilby/core/sampler/fake_sampler.py +++ b/bilby/core/sampler/fake_sampler.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import numpy as np from .base_sampler import Sampler diff --git a/bilby/core/sampler/nestle.py b/bilby/core/sampler/nestle.py index 73f88f1cb..b36680559 100644 --- a/bilby/core/sampler/nestle.py +++ b/bilby/core/sampler/nestle.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import numpy as np from pandas import DataFrame diff --git a/bilby/core/sampler/polychord.py b/bilby/core/sampler/polychord.py index 3c26821b4..22bcc7e3a 100644 --- a/bilby/core/sampler/polychord.py +++ b/bilby/core/sampler/polychord.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import numpy as np diff --git a/bilby/core/sampler/ptemcee.py b/bilby/core/sampler/ptemcee.py index 4dc97a4aa..84c95f250 100644 --- a/bilby/core/sampler/ptemcee.py +++ b/bilby/core/sampler/ptemcee.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, division, print_function import os import datetime diff --git a/bilby/core/sampler/ptmcmc.py b/bilby/core/sampler/ptmcmc.py index 3f9071105..d27698aa7 100644 --- a/bilby/core/sampler/ptmcmc.py +++ b/bilby/core/sampler/ptmcmc.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function import glob import shutil diff --git a/bilby/core/sampler/pymc3.py b/bilby/core/sampler/pymc3.py index 73f5f3edb..9c44b3a62 100644 --- a/bilby/core/sampler/pymc3.py +++ b/bilby/core/sampler/pymc3.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, print_function from collections import OrderedDict from distutils.version import StrictVersion diff --git a/bilby/core/sampler/ultranest.py b/bilby/core/sampler/ultranest.py index 7e2cbcd69..ffeb2e267 100644 --- a/bilby/core/sampler/ultranest.py +++ b/bilby/core/sampler/ultranest.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import datetime import distutils.dir_util diff --git a/bilby/core/utils.py b/bilby/core/utils.py index 8fc3431ed..3b5902155 100644 --- a/bilby/core/utils.py +++ b/bilby/core/utils.py @@ -1,4 +1,3 @@ -from __future__ import division from distutils.spawn import find_executable import logging diff --git a/bilby/gw/likelihood.py b/bilby/gw/likelihood.py index 8a1086cca..76daadee5 100644 --- a/bilby/gw/likelihood.py +++ b/bilby/gw/likelihood.py @@ -1,4 +1,3 @@ -from __future__ import division import gc import os diff --git a/bilby/gw/result.py b/bilby/gw/result.py index 27f01c6fd..80d69f654 100644 --- a/bilby/gw/result.py +++ b/bilby/gw/result.py @@ -1,4 +1,3 @@ -from __future__ import division import json import pickle diff --git a/bilby/gw/sampler/__init__.py b/bilby/gw/sampler/__init__.py index 25ad2ca38..70a655892 100644 --- a/bilby/gw/sampler/__init__.py +++ b/bilby/gw/sampler/__init__.py @@ -1,2 +1 @@ -from __future__ import absolute_import from . import proposal diff --git a/bilby/gw/utils.py b/bilby/gw/utils.py index b89211066..abdcfae40 100644 --- a/bilby/gw/utils.py +++ b/bilby/gw/utils.py @@ -1,4 +1,3 @@ -from __future__ import division import os import json from math import fmod diff --git a/bilby/hyper/likelihood.py b/bilby/hyper/likelihood.py index bc037be3c..25a1ad9ab 100644 --- a/bilby/hyper/likelihood.py +++ b/bilby/hyper/likelihood.py @@ -1,4 +1,3 @@ -from __future__ import division, print_function import logging diff --git a/cli_bilby/__init__.py b/cli_bilby/__init__.py index c3961685a..e69de29bb 100644 --- a/cli_bilby/__init__.py +++ b/cli_bilby/__init__.py @@ -1 +0,0 @@ -from __future__ import absolute_import diff --git a/examples/core_examples/gaussian_example.py b/examples/core_examples/gaussian_example.py index d57896136..4555d825f 100644 --- a/examples/core_examples/gaussian_example.py +++ b/examples/core_examples/gaussian_example.py @@ -3,7 +3,6 @@ An example of how to use bilby to perform paramater estimation for non-gravitational wave data consisting of a Gaussian with a mean and variance """ -from __future__ import division import bilby import numpy as np diff --git a/examples/core_examples/grid_example.py b/examples/core_examples/grid_example.py index af38eb259..29df64f96 100644 --- a/examples/core_examples/grid_example.py +++ b/examples/core_examples/grid_example.py @@ -5,7 +5,6 @@ non-gravitational wave data. In this case, fitting a linear function to data with background Gaussian noise """ -from __future__ import division import bilby import numpy as np import matplotlib.pyplot as plt diff --git a/examples/core_examples/hyper_parameter_example.py b/examples/core_examples/hyper_parameter_example.py index fb8060e4d..71526b68b 100644 --- a/examples/core_examples/hyper_parameter_example.py +++ b/examples/core_examples/hyper_parameter_example.py @@ -2,7 +2,6 @@ """ An example of how to use bilby to perform parameter estimation for hyper params """ -from __future__ import division import numpy as np import matplotlib.pyplot as plt from bilby.core.likelihood import GaussianLikelihood diff --git a/examples/core_examples/linear_regression.py b/examples/core_examples/linear_regression.py index ca0c19af5..7bb143b0b 100644 --- a/examples/core_examples/linear_regression.py +++ b/examples/core_examples/linear_regression.py @@ -5,7 +5,6 @@ non-gravitational wave data. In this case, fitting a linear function to data with background Gaussian noise """ -from __future__ import division import bilby import numpy as np import matplotlib.pyplot as plt diff --git a/examples/core_examples/linear_regression_grid.py b/examples/core_examples/linear_regression_grid.py index 6549c860a..ec0186015 100644 --- a/examples/core_examples/linear_regression_grid.py +++ b/examples/core_examples/linear_regression_grid.py @@ -5,7 +5,6 @@ fitting a linear function to data with background Gaussian noise. This will compare the output of using a stochastic sampling method to evaluating the posterior on a grid. """ -from __future__ import division import numpy as np import matplotlib.pyplot as plt diff --git a/examples/core_examples/linear_regression_pymc3.py b/examples/core_examples/linear_regression_pymc3.py index eb98be1ed..0f42da66a 100644 --- a/examples/core_examples/linear_regression_pymc3.py +++ b/examples/core_examples/linear_regression_pymc3.py @@ -5,7 +5,6 @@ non-gravitational wave data. In this case, fitting a linear function to data with background Gaussian noise """ -from __future__ import division import bilby import numpy as np import matplotlib.pyplot as plt diff --git a/examples/core_examples/linear_regression_pymc3_custom_likelihood.py b/examples/core_examples/linear_regression_pymc3_custom_likelihood.py index 4270e6968..31c951cb9 100644 --- a/examples/core_examples/linear_regression_pymc3_custom_likelihood.py +++ b/examples/core_examples/linear_regression_pymc3_custom_likelihood.py @@ -8,7 +8,6 @@ would give equivalent results as using the pre-defined 'Gaussian Likelihood' """ -from __future__ import division import bilby import numpy as np import matplotlib.pyplot as plt diff --git a/examples/core_examples/linear_regression_unknown_noise.py b/examples/core_examples/linear_regression_unknown_noise.py index e4427c9e0..d276dfa96 100644 --- a/examples/core_examples/linear_regression_unknown_noise.py +++ b/examples/core_examples/linear_regression_unknown_noise.py @@ -5,7 +5,6 @@ non-gravitational wave data. In this case, fitting a linear function to data with background Gaussian noise with unknown variance. """ -from __future__ import division import bilby import numpy as np import matplotlib.pyplot as plt diff --git a/examples/core_examples/multidimensional_gaussian.py b/examples/core_examples/multidimensional_gaussian.py index c0078d50b..327151ef4 100644 --- a/examples/core_examples/multidimensional_gaussian.py +++ b/examples/core_examples/multidimensional_gaussian.py @@ -3,7 +3,6 @@ Testing the recovery of a multi-dimensional Gaussian with zero mean and unit variance """ -from __future__ import division import bilby import numpy as np diff --git a/examples/core_examples/multivariate_gaussian_prior.py b/examples/core_examples/multivariate_gaussian_prior.py index 53d8f94e4..93cfbd24c 100644 --- a/examples/core_examples/multivariate_gaussian_prior.py +++ b/examples/core_examples/multivariate_gaussian_prior.py @@ -4,7 +4,6 @@ An example of how to use bilby with a (multi-modal) multivariate Gaussian prior distribution. """ -from __future__ import division import bilby import numpy as np from scipy import linalg, stats diff --git a/examples/core_examples/occam_factor_example.py b/examples/core_examples/occam_factor_example.py index 319b988c0..f442c58d6 100644 --- a/examples/core_examples/occam_factor_example.py +++ b/examples/core_examples/occam_factor_example.py @@ -30,7 +30,6 @@ Note - the code uses a course 100-point estimation for speed, results can be improved by increasing this to say 500 or 1000. """ -from __future__ import division import bilby import numpy as np import matplotlib.pyplot as plt diff --git a/examples/core_examples/radioactive_decay.py b/examples/core_examples/radioactive_decay.py index aceabd156..3f6b7f052 100644 --- a/examples/core_examples/radioactive_decay.py +++ b/examples/core_examples/radioactive_decay.py @@ -4,7 +4,6 @@ An example of how to use bilby to perform paramater estimation for non-gravitational wave data. In this case, fitting the half-life and initial radionuclide number for Polonium 214. """ -from __future__ import division import bilby import numpy as np import matplotlib.pyplot as plt diff --git a/examples/core_examples/starting_mcmc_chains_near_to_the_peak.py b/examples/core_examples/starting_mcmc_chains_near_to_the_peak.py index 3fcbf45d3..478c41406 100644 --- a/examples/core_examples/starting_mcmc_chains_near_to_the_peak.py +++ b/examples/core_examples/starting_mcmc_chains_near_to_the_peak.py @@ -4,7 +4,6 @@ An example of using emcee, but starting the walkers off close to the peak (or any other arbitrary point). This is based off the linear_regression_with_unknown_noise.py example. """ -from __future__ import division import bilby import numpy as np import pandas as pd diff --git a/examples/gw_examples/data_examples/GW150914.py b/examples/gw_examples/data_examples/GW150914.py index d0fb0631b..34356e2a3 100755 --- a/examples/gw_examples/data_examples/GW150914.py +++ b/examples/gw_examples/data_examples/GW150914.py @@ -9,7 +9,6 @@ the LIGO Data Grid instead. [1] https://gwpy.github.io/docs/stable/timeseries/remote-access.html """ -from __future__ import division, print_function import bilby from gwpy.timeseries import TimeSeries diff --git a/examples/gw_examples/data_examples/GW150914_advanced.py b/examples/gw_examples/data_examples/GW150914_advanced.py index e6f27c3aa..c22568a93 100755 --- a/examples/gw_examples/data_examples/GW150914_advanced.py +++ b/examples/gw_examples/data_examples/GW150914_advanced.py @@ -10,7 +10,6 @@ LIST OF AVAILABLE EVENTS: List of events in BILBY dict: run -> help(bilby.gw.utils.get_event_time(event)) """ -from __future__ import division, print_function import bilby from gwpy.timeseries import TimeSeries diff --git a/examples/gw_examples/data_examples/GW170817.py b/examples/gw_examples/data_examples/GW170817.py index c3e8d6c96..4bcd2e7e5 100644 --- a/examples/gw_examples/data_examples/GW170817.py +++ b/examples/gw_examples/data_examples/GW170817.py @@ -4,7 +4,6 @@ This tutorial includes advanced specifications for analysing binary neutron star event data. Here GW170817 is used as an example. """ -from __future__ import division, print_function import bilby outdir = 'outdir' diff --git a/examples/gw_examples/data_examples/get_LOSC_event_data.py b/examples/gw_examples/data_examples/get_LOSC_event_data.py index 9c7b31479..ece59e10e 100644 --- a/examples/gw_examples/data_examples/get_LOSC_event_data.py +++ b/examples/gw_examples/data_examples/get_LOSC_event_data.py @@ -7,7 +7,6 @@ $ python get_LOSC_event_data -e GW150914 """ -from __future__ import division import numpy as np import os import argparse diff --git a/examples/gw_examples/injection_examples/australian_detector.py b/examples/gw_examples/injection_examples/australian_detector.py index 0da60ef59..6b903a9fc 100644 --- a/examples/gw_examples/injection_examples/australian_detector.py +++ b/examples/gw_examples/injection_examples/australian_detector.py @@ -5,7 +5,6 @@ Tutorial to demonstrate a new interferometer We place a new instrument in Gingin, with an A+ sensitivity in a network of A+ interferometers at Hanford and Livingston """ -from __future__ import division, print_function import numpy as np diff --git a/examples/gw_examples/injection_examples/binary_neutron_star_example.py b/examples/gw_examples/injection_examples/binary_neutron_star_example.py index bbcce5925..e6aa18a9a 100644 --- a/examples/gw_examples/injection_examples/binary_neutron_star_example.py +++ b/examples/gw_examples/injection_examples/binary_neutron_star_example.py @@ -8,7 +8,6 @@ and also estimates the tidal deformabilities using a uniform prior in both tidal deformabilities """ -from __future__ import division, print_function import numpy as np diff --git a/examples/gw_examples/injection_examples/bns_eos_example.py b/examples/gw_examples/injection_examples/bns_eos_example.py index b1e5e029b..d84a86a59 100644 --- a/examples/gw_examples/injection_examples/bns_eos_example.py +++ b/examples/gw_examples/injection_examples/bns_eos_example.py @@ -8,7 +8,6 @@ and also estimates the tidal deformabilities using a uniform prior in both tidal deformabilities """ -from __future__ import division, print_function import numpy as np diff --git a/examples/gw_examples/injection_examples/calibration_example.py b/examples/gw_examples/injection_examples/calibration_example.py index ca5899469..8b9556f48 100644 --- a/examples/gw_examples/injection_examples/calibration_example.py +++ b/examples/gw_examples/injection_examples/calibration_example.py @@ -3,7 +3,6 @@ Tutorial to demonstrate running parameter estimation with calibration uncertainties included. """ -from __future__ import division, print_function import numpy as np import bilby diff --git a/examples/gw_examples/injection_examples/change_sampled_parameters.py b/examples/gw_examples/injection_examples/change_sampled_parameters.py index 9f432ef52..4e0266d08 100644 --- a/examples/gw_examples/injection_examples/change_sampled_parameters.py +++ b/examples/gw_examples/injection_examples/change_sampled_parameters.py @@ -7,7 +7,6 @@ This example estimates the masses using a uniform prior in chirp mass, mass ratio and redshift. The cosmology is according to the Planck 2015 data release. """ -from __future__ import division, print_function import bilby import numpy as np diff --git a/examples/gw_examples/injection_examples/create_your_own_source_model.py b/examples/gw_examples/injection_examples/create_your_own_source_model.py index ded59e157..f755363f0 100644 --- a/examples/gw_examples/injection_examples/create_your_own_source_model.py +++ b/examples/gw_examples/injection_examples/create_your_own_source_model.py @@ -2,7 +2,6 @@ """ A script to demonstrate how to use your own source model """ -from __future__ import division, print_function import bilby import numpy as np diff --git a/examples/gw_examples/injection_examples/custom_proposal_example.py b/examples/gw_examples/injection_examples/custom_proposal_example.py index afd85dace..2a19f4ee6 100644 --- a/examples/gw_examples/injection_examples/custom_proposal_example.py +++ b/examples/gw_examples/injection_examples/custom_proposal_example.py @@ -2,7 +2,6 @@ """ Tutorial for running cpnest with custom jump proposals. """ -from __future__ import division, print_function import numpy as np import bilby.gw.sampler.proposal diff --git a/examples/gw_examples/injection_examples/eccentric_inspiral.py b/examples/gw_examples/injection_examples/eccentric_inspiral.py index 8d3053f35..88c3062e4 100644 --- a/examples/gw_examples/injection_examples/eccentric_inspiral.py +++ b/examples/gw_examples/injection_examples/eccentric_inspiral.py @@ -10,7 +10,6 @@ Lower et al. (2018) -> arXiv:1806.05350. For a more comprehensive look at what goes on in each step, refer to the "basic_tutorial.py" example. """ -from __future__ import division import numpy as np import bilby diff --git a/examples/gw_examples/injection_examples/fake_sampler_example.py b/examples/gw_examples/injection_examples/fake_sampler_example.py index 63c271373..e1e7d600d 100755 --- a/examples/gw_examples/injection_examples/fake_sampler_example.py +++ b/examples/gw_examples/injection_examples/fake_sampler_example.py @@ -2,7 +2,6 @@ """ Read ROQ posterior and calculate full likelihood at same parameter space points. """ -from __future__ import division, print_function import numpy as np import deepdish as dd diff --git a/examples/gw_examples/injection_examples/fast_tutorial.py b/examples/gw_examples/injection_examples/fast_tutorial.py index 89119eb59..0f40818cc 100644 --- a/examples/gw_examples/injection_examples/fast_tutorial.py +++ b/examples/gw_examples/injection_examples/fast_tutorial.py @@ -7,7 +7,6 @@ This example estimates the masses using a uniform prior in both component masses and distance using a uniform in comoving volume prior on luminosity distance between luminosity distances of 100Mpc and 5Gpc, the cosmology is Planck15. """ -from __future__ import division, print_function import numpy as np import bilby diff --git a/examples/gw_examples/injection_examples/how_to_specify_the_prior.py b/examples/gw_examples/injection_examples/how_to_specify_the_prior.py index 68081b4d2..851a3aab3 100644 --- a/examples/gw_examples/injection_examples/how_to_specify_the_prior.py +++ b/examples/gw_examples/injection_examples/how_to_specify_the_prior.py @@ -3,7 +3,6 @@ Tutorial to demonstrate how to specify the prior distributions used for parameter estimation. """ -from __future__ import division, print_function import numpy as np import bilby diff --git a/examples/gw_examples/injection_examples/marginalized_likelihood.py b/examples/gw_examples/injection_examples/marginalized_likelihood.py index c6ab3362c..c28efca13 100644 --- a/examples/gw_examples/injection_examples/marginalized_likelihood.py +++ b/examples/gw_examples/injection_examples/marginalized_likelihood.py @@ -6,7 +6,6 @@ estimation on an injected signal using time, phase and distance marginalisation. We also demonstrate how the posterior distribution for the marginalised parameter can be recovered in post-processing. """ -from __future__ import division, print_function import bilby import numpy as np diff --git a/examples/gw_examples/injection_examples/non_tensor.py b/examples/gw_examples/injection_examples/non_tensor.py index 4b18f9648..6c4421695 100644 --- a/examples/gw_examples/injection_examples/non_tensor.py +++ b/examples/gw_examples/injection_examples/non_tensor.py @@ -6,7 +6,6 @@ allowed in general relativity. We adapt the sine-Gaussian burst model to include vector polarizations with an unknown contribution from the vector modes. """ -from __future__ import division, print_function import bilby import numpy as np diff --git a/examples/gw_examples/injection_examples/plot_skymap.py b/examples/gw_examples/injection_examples/plot_skymap.py index 5d2a1ffaf..4c7ecb9a3 100644 --- a/examples/gw_examples/injection_examples/plot_skymap.py +++ b/examples/gw_examples/injection_examples/plot_skymap.py @@ -3,7 +3,6 @@ Example script which produces posterior samples of ra and dec and generates a skymap """ -from __future__ import division, print_function import bilby duration = 4. diff --git a/examples/gw_examples/injection_examples/plot_time_domain_data.py b/examples/gw_examples/injection_examples/plot_time_domain_data.py index eee3c8557..4e572e8a5 100644 --- a/examples/gw_examples/injection_examples/plot_time_domain_data.py +++ b/examples/gw_examples/injection_examples/plot_time_domain_data.py @@ -1,7 +1,6 @@ #!/usr/bin/env python """ """ -from __future__ import division, print_function import numpy as np import bilby diff --git a/examples/gw_examples/injection_examples/roq_example.py b/examples/gw_examples/injection_examples/roq_example.py index 69bff31df..9b8b9d97a 100644 --- a/examples/gw_examples/injection_examples/roq_example.py +++ b/examples/gw_examples/injection_examples/roq_example.py @@ -8,7 +8,6 @@ This requires files specifying the appropriate basis weights. These aren't shipped with Bilby, but are available on LDG clusters and from the public repository https://git.ligo.org/lscsoft/ROQ_data. """ -from __future__ import division, print_function import numpy as np diff --git a/examples/gw_examples/injection_examples/sine_gaussian_example.py b/examples/gw_examples/injection_examples/sine_gaussian_example.py index 07ac1ff0b..d40cb68e8 100644 --- a/examples/gw_examples/injection_examples/sine_gaussian_example.py +++ b/examples/gw_examples/injection_examples/sine_gaussian_example.py @@ -3,7 +3,6 @@ Tutorial to demonstrate running parameter estimation on a sine gaussian injected signal. """ -from __future__ import division, print_function import bilby import numpy as np diff --git a/examples/gw_examples/injection_examples/standard_15d_cbc_tutorial.py b/examples/gw_examples/injection_examples/standard_15d_cbc_tutorial.py index 822c11b10..7eef1b429 100644 --- a/examples/gw_examples/injection_examples/standard_15d_cbc_tutorial.py +++ b/examples/gw_examples/injection_examples/standard_15d_cbc_tutorial.py @@ -4,7 +4,6 @@ Tutorial to demonstrate running parameter estimation on a full 15 parameter space for an injected cbc signal. This is the standard injection analysis script one can modify for the study of injected CBC events. """ -from __future__ import division, print_function import numpy as np import bilby diff --git a/examples/gw_examples/injection_examples/using_gwin.py b/examples/gw_examples/injection_examples/using_gwin.py index 4d9c583ac..de68a8288 100644 --- a/examples/gw_examples/injection_examples/using_gwin.py +++ b/examples/gw_examples/injection_examples/using_gwin.py @@ -15,7 +15,6 @@ of the model. So, in the following, we only create priors for the parameters to be searched over. """ -from __future__ import division, print_function import numpy as np import bilby diff --git a/examples/gw_examples/supernova_example/supernova_example.py b/examples/gw_examples/supernova_example/supernova_example.py index 507c4e4ed..b5de9f407 100644 --- a/examples/gw_examples/supernova_example/supernova_example.py +++ b/examples/gw_examples/supernova_example/supernova_example.py @@ -7,7 +7,6 @@ supernova waveforms. The first few PCs are then linearly combined with a scale factor. (See https://arxiv.org/pdf/1202.3256.pdf) """ -from __future__ import division, print_function import numpy as np import bilby diff --git a/requirements.txt b/requirements.txt index bf8b8babc..8512031dd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -future dynesty emcee corner diff --git a/setup.py b/setup.py index 0882ade9b..79fe30cfe 100644 --- a/setup.py +++ b/setup.py @@ -87,7 +87,6 @@ setup(name='bilby', 'bilby': [version_file]}, python_requires='>=3.5', install_requires=[ - 'future', 'dynesty>=1.0.0', 'emcee', 'corner', diff --git a/test/core/prior/prior_test.py b/test/core/prior/prior_test.py index dc6ee205e..2bbbc2bf1 100644 --- a/test/core/prior/prior_test.py +++ b/test/core/prior/prior_test.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, division import bilby import unittest import numpy as np -- GitLab