diff --git a/pyfstat/grid_based_searches.py b/pyfstat/grid_based_searches.py index c4513ac16a2d14b19bad9f046fb4961199ad53c2..0d61e3f41d09b07182a755d7da83f45e45f395ef 100644 --- a/pyfstat/grid_based_searches.py +++ b/pyfstat/grid_based_searches.py @@ -12,7 +12,7 @@ import socket import numpy as np import matplotlib import matplotlib.pyplot as plt -from scipy.misc import logsumexp +from scipy.special import logsumexp import pyfstat.helper_functions as helper_functions from pyfstat.core import (BaseSearchClass, ComputeFstat, diff --git a/setup.py b/setup.py index 2f03d835110d223f056e4798043888d9b241d60d..d9557b966801542f44a36fd45a2f27d1fbb07ed1 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,31 @@ #!/usr/bin/env python -from distutils.core import setup +from setuptools import setup, find_packages +from os import path + +here = path.abspath(path.dirname(__file__)) +# Get the long description from the README file +with open(path.join(here, 'README.md'), encoding='utf-8') as f: + long_description = f.read() setup(name='PyFstat', version='0.2', author='Gregory Ashton', author_email='gregory.ashton@ligo.org', - packages=['pyfstat'], + packages=find_packages(where="pyfstat"), include_package_data=True, package_data={'pyfstat': ['pyCUDAkernels/cudaTransientFstatExpWindow.cu', 'pyCUDAkernels/cudaTransientFstatRectWindow.cu']}, - ) + install_requires=[ + 'matplotlib', + 'scipy', + 'ptemcee', + 'corner', + 'dill', + 'tqdm', + 'bashplotlib', + 'peakutils', + 'pathos', + 'pycuda', + ], +) diff --git a/tests.py b/tests.py index 284d32545100429da1eec235c0f8a4cf6e0c70c9..c67e40dbb48cf4a212bfb2bef627794e4849a16f 100644 --- a/tests.py +++ b/tests.py @@ -93,7 +93,6 @@ class par(Test): label = 'TestPar' def test(self): - os.system('mkdir {}'.format(self.outdir)) os.system( 'echo "x=100\ny=10" > {}/{}.par'.format(self.outdir, self.label))