From 5f348df683ef5123cb015caf08a4abbd4b2588f7 Mon Sep 17 00:00:00 2001 From: CamDavidsonPilon Date: Tue, 2 Jan 2024 21:14:06 -0500 Subject: [PATCH] fix tst --- CHANGELOG.md | 3 ++- lifelines/tests/test_estimation.py | 6 +++--- reqs/base-requirements.txt | 2 +- setup.py | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a6e361c9..e61642f37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,10 @@ #### 0.28.0 - Upcoming - Fixes bins that are far into the future with using `survival_table_from_events`, see #1587 - Removed `sklean_adaptor`. It was a terrible hack, and causing more confusion and support debt than I want. This cleans up our API and simplifies the library. ✨ There's no replacement, and I doubt I'll introduce one ✨ - - Fix Pandas 2.0 compatibility. + - Fix pandas>=2.0 compatibility. - Fix overflow issue in NelsonAalenfitter, #1585 - officially drop support for < py3.9 + - update some dependencies (pandas >= 1.2) #### 0.27.8 - 2023-09-13 - Estimators now have `.label` property diff --git a/lifelines/tests/test_estimation.py b/lifelines/tests/test_estimation.py index 4de2208e3..254cff9d9 100644 --- a/lifelines/tests/test_estimation.py +++ b/lifelines/tests/test_estimation.py @@ -587,9 +587,9 @@ def test_lists_and_tuples_as_input(self, positive_sample_lifetimes, univariate_f assert_frame_equal(with_list, with_array) assert_frame_equal(with_tuple, with_array) - with_array = fitter.fit_left_censoring(T, C).survival_function_ - with_list = fitter.fit_left_censoring(list(T), list(C)).survival_function_ - with_tuple = fitter.fit_left_censoring(tuple(T), tuple(C)).survival_function_ + with_array = fitter.fit_left_censoring(T).survival_function_ + with_list = fitter.fit_left_censoring(list(T)).survival_function_ + with_tuple = fitter.fit_left_censoring(tuple(T)).survival_function_ assert_frame_equal(with_list, with_array) assert_frame_equal(with_tuple, with_array) diff --git a/reqs/base-requirements.txt b/reqs/base-requirements.txt index 0558477a6..816cf6453 100644 --- a/reqs/base-requirements.txt +++ b/reqs/base-requirements.txt @@ -1,6 +1,6 @@ numpy>=1.14.0,<2.0 scipy>=1.2.0 -pandas>=1.0.0 +pandas>=1.2.0 matplotlib>=3.0 autograd>=1.5 autograd-gamma>=0.3 diff --git a/setup.py b/setup.py index ad39a2f52..b05e54ae1 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ PACKAGE_DATA = {"lifelines": ["datasets/*"]} DESCRIPTION = "Survival analysis in Python, including Kaplan Meier, Nelson Aalen and regression" URL = "https://github.com/CamDavidsonPilon/lifelines" -PYTHON_REQ = ">=3.7" +PYTHON_REQ = ">=3.9" setup( name=NAME,