PyTransit 2.6.13__tar.gz → 2.6.14__tar.gz

{pytransit-2.6.13 → pytransit-2.6.14}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: PyTransit
-Version: 2.6.13
+Version: 2.6.14
 Summary: Fast and painless exoplanet transit light curve modelling.
 Author-email: Hannu Parviainen <hpparvi@gmail.com>
 License: GPLv2
@@ -36,6 +36,7 @@ Requires-Dist: pyopencl
 Requires-Dist: corner
 Requires-Dist: celerite
 Requires-Dist: meepmeep
+Dynamic: license-file
 
 PyTransit
 =========

{pytransit-2.6.13 → pytransit-2.6.14}/PyTransit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: PyTransit
-Version: 2.6.13
+Version: 2.6.14
 Summary: Fast and painless exoplanet transit light curve modelling.
 Author-email: Hannu Parviainen <hpparvi@gmail.com>
 License: GPLv2
@@ -36,6 +36,7 @@ Requires-Dist: pyopencl
 Requires-Dist: corner
 Requires-Dist: celerite
 Requires-Dist: meepmeep
+Dynamic: license-file
 
 PyTransit
 =========

{pytransit-2.6.13 → pytransit-2.6.14}/pytransit/__init__.py

@@ -41,7 +41,7 @@ Date
 
 """
 
-__version__ = '2.6.13'
+__version__ = '2.6.14'
 
 # Generic
 # -------

{pytransit-2.6.13 → pytransit-2.6.14}/pytransit/models/gdmodel.py

@@ -23,7 +23,7 @@ from numpy import linspace, sin, cos, array, ndarray, asarray, squeeze, cross, n
     zeros, polyfit, atleast_2d, atleast_1d, nansum, zeros_like
 from numpy.linalg import norm
 from scipy.interpolate import interp1d
-from scipy.spatial.transform.rotation import Rotation
+from scipy.spatial.transform import Rotation
 
 from .transitmodel import TransitModel
 from .numba.gdmodel import create_star_xy, create_planet_xy, map_osm, xy_taylor_vt, oblate_model_s, \

{pytransit-2.6.13 → pytransit-2.6.14}/pytransit/models/roadrunner/opmodel_full.py

@@ -27,7 +27,6 @@ def op_full(times: ndarray, k: ndarray, f: ndarray, alpha: ndarray,
             parallelize: bool, nlc: int, npb: int, nep: int, npl: int,
             lcids: ndarray, pbids: ndarray, epids: ndarray, nsamples: ndarray, exptimes: ndarray,
             ldp: ndarray, istar: ndarray, weights: ndarray, dk: float, kmin: float, kmax: float, dg: float, z_edges: ndarray):
-    """Full RoadRunner model for heterogeneous light curves."""
 
     #if parallelize:
     #    return op_full_parallel(times, k, f, alpha, t0, p, a, i, e, w, nlc, npb, nep, npl,
@@ -45,7 +44,7 @@ def op_full_serial(times: ndarray, k: ndarray, f: ndarray, alpha: ndarray,
             nlc: int, npb: int, nep: int, npl: int,
             lcids: ndarray, pbids: ndarray, epids: ndarray, nsamples: ndarray, exptimes: ndarray,
             ldp: ndarray, istar: ndarray, weights: ndarray, dk: float, kmin: float, kmax: float, dg: float, z_edges: ndarray):
-    """Full RoadRunner model for heterogeneous light curves."""
+
     npv = k.shape[0]
     npt = times.size
     ng = weights.shape[1]

{pytransit-2.6.13 → pytransit-2.6.14}/pytransit/param/parameter.py

@@ -108,10 +108,10 @@ class LParameterBlock(GParameterBlock):
 
 class ParameterSet(list):
     def __init__(self, *args):
-        super().__init__(*args)
         self.blocks = []
         self.bounds = None
         self.frozen = False
+        super().__init__(*args)
 
     def add_global_block(self, name, pars):
         start = len(self)

{pytransit-2.6.13 → pytransit-2.6.14}/pytransit/utils/de.py

@@ -22,7 +22,7 @@ Implements the differential evolution optimization method by Storn & Price
 """
 
 from numba import njit
-from numpy import asarray, zeros, zeros_like, tile, array, argmin, mod
+from numpy import asarray, zeros, zeros_like, tile, array, argmin, mod, ptp
 from numpy.random import random, randint, rand, seed as rseed, uniform
 
 
@@ -215,7 +215,7 @@ class DiffEvol(object):
             fitc[msk] = fitt[msk]
 
             self._minidx = argmin(fitc)
-            if fitc.ptp() < self.min_ptp:
+            if ptp(fitc) < self.min_ptp:
                 break
 
             yield popc[self._minidx, :], fitc[self._minidx]
@@ -241,7 +241,7 @@ class DiffEvol(object):
             fitc[msk] = fitt[msk]
 
             self._minidx = argmin(fitc)
-            if fitc.ptp() < self.min_ptp:
+            if ptp(fitc) < self.min_ptp:
                 break
 
             yield popc[self._minidx, :], fitc[self._minidx]

{pytransit-2.6.13 → pytransit-2.6.14}/tests/test_contamination.py

@@ -16,7 +16,7 @@
 
 import unittest
 from math import pi
-from numpy import array, copysign, inf
+from numpy import array, copysign, inf, errstate
 from numpy.testing import assert_almost_equal
 
 from pytransit.contamination import true_radius_ratio, apparent_radius_ratio
@@ -30,11 +30,13 @@ class TestContamination(unittest.TestCase):
 
     def test_true_radius_ratio(self):
         assert_almost_equal(true_radius_ratio(0.1, 0.0), 0.1)
-        assert_almost_equal(true_radius_ratio(0.1, 1.0), inf)
+        with errstate(divide='ignore'):
+            assert_almost_equal(true_radius_ratio(0.1, 1.0), inf)
 
     def test_apparent_radius_ratio(self):
         assert_almost_equal(apparent_radius_ratio(0.1, 0.0), 0.1)
-        assert_almost_equal(apparent_radius_ratio(0.1, 1.0), 0.0)
+        with errstate(divide='ignore'):
+            assert_almost_equal(apparent_radius_ratio(0.1, 1.0), 0.0)
 
 
 if __name__ == '__main__':