lifelines 0.29.0__tar.gz → 0.30.0__tar.gz

{lifelines-0.29.0/lifelines.egg-info → lifelines-0.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lifelines
-Version: 0.29.0
+Version: 0.30.0
 Summary: Survival analysis in Python, including Kaplan Meier, Nelson Aalen and regression
 Home-page: https://github.com/CamDavidsonPilon/lifelines
 Author: Cameron Davidson-Pilon
@@ -16,7 +16,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy<2.0,>=1.14.0
+Requires-Dist: numpy>=1.14.0
 Requires-Dist: scipy>=1.7.0
 Requires-Dist: pandas>=2.1
 Requires-Dist: matplotlib>=3.0

{lifelines-0.29.0 → lifelines-0.30.0}/lifelines/fitters/coxph_fitter.py

@@ -2991,7 +2991,11 @@ class ParametricSplinePHFitter(ParametricCoxModelFitter, SplineFitterMixin):
 
     @staticmethod
     def _strata_labeler(stratum, i):
-        return "s%s_phi%d_" % (stratum, i)
+        try:
+            return "s%s_phi%d_" % (tuple(str(s) for s in stratum), i)
+        except:
+            # singleton
+            return "s%s_phi%d_" % (stratum, i)
 
     @property
     def _fitted_parameter_names(self):
@@ -3112,7 +3116,11 @@ class ParametricPiecewiseBaselinePHFitter(ParametricCoxModelFitter, Proportional
 
     @staticmethod
     def _strata_labeler(stratum, i):
-        return "s%s_lambda%d_" % (stratum, i)
+        try:
+            return "s%s_lambda%d_" % (tuple(str(s) for s in stratum), i)
+        except:
+            # singleton
+            return "s%s_lambda%d_" % (stratum, i)
 
     @property
     def _fitted_parameter_names(self):

{lifelines-0.29.0 → lifelines-0.30.0}/lifelines/statistics.py

@@ -111,14 +111,14 @@ class StatisticalResult:
 
         """
         if style is not None:
-            self._print_specific_style(style)
+            self._print_specific_style(style, decimals=decimals, **kwargs)
         else:
             try:
                 from IPython.display import display
 
                 display(self)
             except ImportError:
-                self._ascii_print()
+                self._ascii_print(decimals=decimals, **kwargs)
 
     def _html_print(self, decimals=2, **kwargs):
         print(self.to_html(decimals, **kwargs))
@@ -835,7 +835,7 @@ def multivariate_logrank_test(
     assert abs(Z_j.sum()) < 10e-8, "Sum is not zero."  # this should move to a test eventually.
 
     # compute covariance matrix
-    factor = (((n_i - d_i) / (n_i - 1)).replace([np.inf, np.nan], 1)) * d_i / n_i ** 2
+    factor = (((n_i - d_i) / (n_i - 1)).replace([np.inf, np.nan], 1)) * d_i / n_i**2
     n_ij["_"] = n_i.values
     V_ = (n_ij.mul(w_i, axis=0)).mul(np.sqrt(factor), axis="index").fillna(0)  # weighted V_
     V = -np.dot(V_.T, V_)
@@ -923,7 +923,7 @@ def proportional_hazard_test(
     def compute_statistic(times, resids, n_deaths):
         demeaned_times = times - times.mean()
         T = (demeaned_times.values[:, None] * resids.values).sum(0) ** 2 / (
-            n_deaths * (fitted_cox_model.standard_errors_ ** 2) * (demeaned_times ** 2).sum()
+            n_deaths * (fitted_cox_model.standard_errors_**2) * (demeaned_times**2).sum()
         )
         return T
 

{lifelines-0.29.0 → lifelines-0.30.0}/lifelines/tests/test_estimation.py

@@ -3320,7 +3320,7 @@ class TestCoxPHFitter:
 
         assert_frame_equal(
             cph.summary.loc[[("beta_", "Intercept"), ("phi1_", "Intercept")]].reset_index(drop=True),
-            trivial_strata_cph.summary.loc[[("beta_", "Intercept"), ("sa_phi1_", "Intercept")]].reset_index(drop=True),
+            trivial_strata_cph.summary.loc[[("beta_", "Intercept"), ("s('a',)_phi1_", "Intercept")]].reset_index(drop=True),
             atol=0.05,
         )
 

{lifelines-0.29.0 → lifelines-0.30.0}/lifelines/version.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = "0.29.0"
+__version__ = "0.30.0"

{lifelines-0.29.0 → lifelines-0.30.0/lifelines.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lifelines
-Version: 0.29.0
+Version: 0.30.0
 Summary: Survival analysis in Python, including Kaplan Meier, Nelson Aalen and regression
 Home-page: https://github.com/CamDavidsonPilon/lifelines
 Author: Cameron Davidson-Pilon
@@ -16,7 +16,7 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy<2.0,>=1.14.0
+Requires-Dist: numpy>=1.14.0
 Requires-Dist: scipy>=1.7.0
 Requires-Dist: pandas>=2.1
 Requires-Dist: matplotlib>=3.0

{lifelines-0.29.0 → lifelines-0.30.0}/lifelines.egg-info/requires.txt

@@ -1,4 +1,4 @@
-numpy<2.0,>=1.14.0
+numpy>=1.14.0
 scipy>=1.7.0
 pandas>=2.1
 matplotlib>=3.0

{lifelines-0.29.0 → lifelines-0.30.0}/reqs/base-requirements.txt

@@ -1,4 +1,4 @@
-numpy>=1.14.0,<2.0
+numpy>=1.14.0
 scipy>=1.7.0
 pandas>=2.1
 matplotlib>=3.0