v1.2

florent-leclercq · Aug 1, 2019 · 8b79a1b · 8b79a1b
1 parent 3e5d2fb
commit 8b79a1b
Show file tree

Hide file tree

Showing 22 changed files with 48 additions and 48 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![arXiv](https://img.shields.io/badge/astro--ph.CO-arxiv%3A1902.10149-B31B1B.svg?style=flat)](https://arxiv.org/abs/1902.10149)
 [![GitHub version](https://img.shields.io/github/tag/florent-leclercq/pyselfi.svg?label=version)](https://github.com/florent-leclercq/pyselfi)
-[![GitHub commits](https://img.shields.io/github/commits-since/florent-leclercq/pyselfi/v1.1.svg)](https://github.com/florent-leclercq/pyselfi/commits)
+[![GitHub commits](https://img.shields.io/github/commits-since/florent-leclercq/pyselfi/v1.2.svg)](https://github.com/florent-leclercq/pyselfi/commits)
 [![DOI](https://zenodo.org/badge/197575311.svg)](https://zenodo.org/badge/latestdoi/197575311)
 [![GPLv3 license](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://github.com/florent-leclercq/pyselfi/blob/master/LICENSE)
 [![PyPI version](https://badge.fury.io/py/pyselfi.svg)](https://badge.fury.io/py/pyselfi)

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- doc/source/conf.py
+# pySELFI v1.2 -- doc/source/conf.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -50,7 +50,7 @@
 author = 'Florent Leclercq'
 
 # The full version, including alpha/beta/rc tags
-release = '1.1'
+release = '1.2'
 
 # -- General configuration ---------------------------------------------------
 

diff --git a/doc/source/description.rst b/doc/source/description.rst
@@ -6,7 +6,7 @@
 .. |GitHub version| image:: https://img.shields.io/github/tag/florent-leclercq/pyselfi.svg?label=version
    :target: https://github.com/florent-leclercq/pyselfi
 
-.. |GitHub commits| image:: https://img.shields.io/github/commits-since/florent-leclercq/pyselfi/v1.1.svg
+.. |GitHub commits| image:: https://img.shields.io/github/commits-since/florent-leclercq/pyselfi/v1.2.svg
    :target: https://github.com/florent-leclercq/pyselfi/commits
 
 .. |DOI| image:: https://zenodo.org/badge/197575311.svg

diff --git a/pyselfi/__init__.py b/pyselfi/__init__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi/__init__.py
+# pySELFI v1.2 -- pyselfi/__init__.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -23,7 +23,7 @@
 
 __author__  = "Florent Leclercq"
 __date__    = "2018-2019"
-__version__ = "1.1"
+__version__ = "1.2"
 __license__ = "GPLv3"
 
 from .selfi import selfi

diff --git a/pyselfi/likelihood.py b/pyselfi/likelihood.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi/likelihood.py
+# pySELFI v1.2 -- pyselfi/likelihood.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -26,7 +26,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 

diff --git a/pyselfi/pool.py b/pyselfi/pool.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi/pool.py
+# pySELFI v1.2 -- pyselfi/pool.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -22,7 +22,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 

diff --git a/pyselfi/posterior.py b/pyselfi/posterior.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi/posterior.py
+# pySELFI v1.2 -- pyselfi/posterior.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -26,7 +26,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 

diff --git a/pyselfi/power_spectrum/__init__.py b/pyselfi/power_spectrum/__init__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi/power_spectrum/__init__.py
+# pySELFI v1.2 -- pyselfi/power_spectrum/__init__.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -23,7 +23,7 @@
 
 __author__  = "Florent Leclercq"
 __date__    = "2018-2019"
-__version__ = "1.1"
+__version__ = "1.2"
 __license__ = "GPLv3"
 
 from .prior import power_spectrum_prior

diff --git a/pyselfi/power_spectrum/prior.py b/pyselfi/power_spectrum/prior.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi/power_spectrum/prior.py
+# pySELFI v1.2 -- pyselfi/power_spectrum/prior.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -26,7 +26,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 

diff --git a/pyselfi/power_spectrum/selfi.py b/pyselfi/power_spectrum/selfi.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi/power_spectrum/selfi.py
+# pySELFI v1.2 -- pyselfi/power_spectrum/selfi.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -26,7 +26,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 

diff --git a/pyselfi/selfi.py b/pyselfi/selfi.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi/selfi.py
+# pySELFI v1.2 -- pyselfi/selfi.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -22,7 +22,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 

diff --git a/pyselfi/utils.py b/pyselfi/utils.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi/utils.py
+# pySELFI v1.2 -- pyselfi/utils.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -22,7 +22,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 

diff --git a/pyselfi_examples/grf/model/__init__.py b/pyselfi_examples/grf/model/__init__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi_examples/grf/model/__init__.py
+# pySELFI v1.2 -- pyselfi_examples/grf/model/__init__.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -23,5 +23,5 @@
 
 __author__  = "Florent Leclercq"
 __date__    = "2018-2019"
-__version__ = "1.1"
+__version__ = "1.2"
 __license__ = "GPLv3"
diff --git a/pyselfi_examples/grf/model/blackbox_GRF.py b/pyselfi_examples/grf/model/blackbox_GRF.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi_examples/grf/model/blackbox_GRF.py
+# pySELFI v1.2 -- pyselfi_examples/grf/model/blackbox_GRF.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -22,7 +22,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 
@@ -98,8 +98,8 @@ def _get_powerspectrum_from_cosmo(self, cosmo, fname_powerspectrum, force=False)
             power spectrum object
 
         """
-        from power import PowerSpectrum
         from os.path import exists
+        from pysbmy.power import PowerSpectrum
         if exists(fname_powerspectrum) and not force:
             P=PowerSpectrum.read(fname_powerspectrum)
         else:
@@ -123,9 +123,9 @@ def _get_powerspectrum_from_theta(self, theta):
             power spectrum object
 
         """
-        from power import PowerSpectrum
-        from scipy.interpolate import InterpolatedUnivariateSpline
         from os.path import exists
+        from scipy.interpolate import InterpolatedUnivariateSpline
+        from pysbmy.power import PowerSpectrum
         G_sim=self.G_sim
         P=self.theta2P(theta)
         Spline=InterpolatedUnivariateSpline(self.k_s, P, k=5)
@@ -155,8 +155,8 @@ def _aux_blackbox(self, P, seedphases=None, seednoise=None):
         import numpy as np
         import scipy.stats as ss
         from pysbmy import c_double, c_float_t
-        from field import Field
-        from correlations import get_autocorrelation
+        from pysbmy.field import Field
+        from pysbmy.correlations import get_autocorrelation
 
         G_sim=self.G_sim
         P_ss=self.P_ss

diff --git a/pyselfi_examples/grf/model/setup_GRF.py b/pyselfi_examples/grf/model/setup_GRF.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi_examples/grf/model/setup_GRF.py
+# pySELFI v1.2 -- pyselfi_examples/grf/model/setup_GRF.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -22,7 +22,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 

diff --git a/pyselfi_examples/simbelmyne/model/__init__.py b/pyselfi_examples/simbelmyne/model/__init__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi_examples/simbelmyne/model/__init__.py
+# pySELFI v1.2 -- pyselfi_examples/simbelmyne/model/__init__.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -23,5 +23,5 @@
 
 __author__  = "Florent Leclercq"
 __date__    = "2018-2019"
-__version__ = "1.1"
+__version__ = "1.2"
 __license__ = "GPLv3"
diff --git a/pyselfi_examples/simbelmyne/model/blackbox_SBMY.py b/pyselfi_examples/simbelmyne/model/blackbox_SBMY.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi_examples/simbelmyne/model/blackbox_SBMY.py
+# pySELFI v1.2 -- pyselfi_examples/simbelmyne/model/blackbox_SBMY.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -22,7 +22,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 

diff --git a/pyselfi_examples/simbelmyne/model/setup_SBMY.py b/pyselfi_examples/simbelmyne/model/setup_SBMY.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi_examples/simbelmyne/model/setup_SBMY.py
+# pySELFI v1.2 -- pyselfi_examples/simbelmyne/model/setup_SBMY.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -22,7 +22,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 

diff --git a/pyselfi_examples/templates/new_blackbox.py b/pyselfi_examples/templates/new_blackbox.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi_examples/templates/new_blackbox.py
+# pySELFI v1.2 -- pyselfi_examples/templates/new_blackbox.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -22,7 +22,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 

diff --git a/pyselfi_examples/templates/new_prior.py b/pyselfi_examples/templates/new_prior.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi_examples/templates/new_prior.py
+# pySELFI v1.2 -- pyselfi_examples/templates/new_prior.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -22,7 +22,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 

diff --git a/pyselfi_examples/templates/new_selfi.py b/pyselfi_examples/templates/new_selfi.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- pyselfi_examples/templates/new_selfi.py
+# pySELFI v1.2 -- pyselfi_examples/templates/new_selfi.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -22,7 +22,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #-------------------------------------------------------------------------------------
-# pySELFI v1.1 -- setup.py
+# pySELFI v1.2 -- setup.py
 # Copyright (C) 2019-2019 Florent Leclercq.
 # 
 # This file is part of the pySELFI distribution
@@ -22,7 +22,7 @@
 """
 
 __author__  = "Florent Leclercq"
-__version__ = "1.1"
+__version__ = "1.2"
 __date__    = "2018-2019"
 __license__ = "GPLv3"
 
@@ -44,7 +44,7 @@ def requirements():
 # Setup
 setuptools.setup(
     name="pyselfi",
-    version="1.1",
+    version="1.2",
     author="Florent Leclercq",
     author_email="[email protected]",
     description="A python implementation of the Simulator Expansion for Likelihood-Free Inference (SELFI) algorithm",