scikit-survival 0.26.0__cp311-cp311-macosx_10_13_x86_64.whl → 0.27.0__cp311-cp311-macosx_10_13_x86_64.whl

{scikit_survival-0.26.0.dist-info → scikit_survival-0.27.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scikit-survival
-Version: 0.26.0
+Version: 0.27.0
 Summary: Survival analysis built on top of scikit-learn
 Author-email: Sebastian Pölsterl <sebp@k-d-w.org>
 License-Expression: GPL-3.0-or-later
@@ -31,16 +31,16 @@ License-File: COPYING
 Requires-Dist: ecos
 Requires-Dist: joblib
 Requires-Dist: numexpr
-Requires-Dist: numpy
+Requires-Dist: numpy>=2.0.0
 Requires-Dist: osqp>=1.0.2
-Requires-Dist: pandas>=2.0.0
-Requires-Dist: scipy>=1.3.2
-Requires-Dist: scikit-learn<1.8,>=1.6.1
+Requires-Dist: pandas>=2.2.0
+Requires-Dist: scipy>=1.13.0
+Requires-Dist: scikit-learn<1.9,>=1.8.0
 Dynamic: license-file
 
 |License| |Docs| |DOI|
 
-|build-tests| |build-windows| |Codecov| |Codacy|
+|build-tests| |Codecov| |Codacy|
 
 ***************
 scikit-survival
@@ -76,10 +76,10 @@ Requirements
 - ecos
 - joblib
 - numexpr
-- numpy
+- numpy 2.0.0 or later
 - osqp
-- pandas 2.0.0 or later
-- scikit-learn 1.6 or 1.7
+- pandas 2.2.0 or later
+- scikit-learn 1.8
 - scipy
 - C/C++ compiler
 
@@ -178,8 +178,4 @@ Please cite the following paper if you are using **scikit-survival**.
   :target: https://github.com/sebp/scikit-survival/actions?query=workflow%3Atests+branch%3Amaster
   :alt: GitHub Actions Tests Status
 
-.. |build-windows| image:: https://ci.appveyor.com/api/projects/status/github/sebp/scikit-survival?branch=master&svg=true
-   :target: https://ci.appveyor.com/project/sebp/scikit-survival
-   :alt: Windows Build Status on AppVeyor
-
 .. _survival analysis: https://en.wikipedia.org/wiki/Survival_analysis

{scikit_survival-0.26.0.dist-info → scikit_survival-0.27.0.dist-info}/RECORD

@@ -1,33 +1,33 @@
-scikit_survival-0.26.0.dist-info/RECORD,,
-scikit_survival-0.26.0.dist-info/WHEEL,sha256=yoGyruR5luWhmkaGvb6F6SKVgx5My2KED1c4tyM2fXM,138
-scikit_survival-0.26.0.dist-info/top_level.txt,sha256=fPkcFA-XQGbwnD_ZXOvaOWmSd34Qezr26Mn99nYPvAg,7
-scikit_survival-0.26.0.dist-info/METADATA,sha256=vAt2W61HBUXRJsF8i5dfZzXmuSaF5xn5aIswUbue1LE,7180
-scikit_survival-0.26.0.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+scikit_survival-0.27.0.dist-info/RECORD,,
+scikit_survival-0.27.0.dist-info/WHEEL,sha256=RDuwBvahcjkfIgBIU2eDck6a2e_vDYHjyKNLxkUkoeU,139
+scikit_survival-0.27.0.dist-info/top_level.txt,sha256=fPkcFA-XQGbwnD_ZXOvaOWmSd34Qezr26Mn99nYPvAg,7
+scikit_survival-0.27.0.dist-info/METADATA,sha256=dPPT8BmqDfq_N5pEWc2GPDgGr16wgXY5cvTt-BcxZjE,6950
+scikit_survival-0.27.0.dist-info/licenses/COPYING,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
 sksurv/functions.py,sha256=e0jVqnEtyHoI7qjn18gHD2oRTCoOOA3i6p90tDgMWKs,3898
-sksurv/metrics.py,sha256=C8vWJEQ1CysbaG4KRnQA7cHOttDZsLGNAaL1DSVgccI,41241
+sksurv/metrics.py,sha256=a75hixN4WZm8vlNmn61dksLdRVEQUEKg1htbDrIa7JU,41249
 sksurv/nonparametric.py,sha256=Bhvtr_j3gozbcnMcXJ_55BbfAEua-n4-hzTiVtBYt6M,31748
 sksurv/util.py,sha256=1zX5DcUCw-9oM2uwMPrC5C736g3VsmxgL_w5piTuBew,15809
 sksurv/__init__.py,sha256=eRitrwFtAUadhvZtcasgO443RRMaPTmJHCph3dWkHSg,5153
 sksurv/docstrings.py,sha256=PJTe7sts8j6x3Gck_18buulAr2HIMOF6GnWDtrLQtIw,3301
 sksurv/preprocessing.py,sha256=proeFKkPiyx4UDCwEnaOo0jLUTqA3jbnSP28R2izbPw,6974
 sksurv/exceptions.py,sha256=CRun7zrKzcZ9zinni5b2cMaV-pU-pw1UnXpRV2h3z_4,801
-sksurv/testing.py,sha256=l2jWKYxBzQcHhax7x1i_tfbAVuaq7J9yqqOLCj8qdMQ,5788
+sksurv/testing.py,sha256=qyhAvOz_Q3lQ6D7hMUuqy-CbpjpwkXwmb1l8mlpoCk4,6097
 sksurv/compare.py,sha256=RCfPU-EhM1C_8BMhNV5eb34ZrTZX6ODkB6KxTHQh-6E,4420
 sksurv/base.py,sha256=JGjekQGBRQdwS6AlI6uuNowT3KOpgBHCzxJGq6dsgew,4373
 sksurv/column.py,sha256=ptWBSh2llhSPeGOxxmoAYhlI2KXXRJjJEZO9K9-eZXQ,6869
 sksurv/tree/tree.py,sha256=uvCcwIGVqx2x39ycIsLtJSKWBhty37uDKr85zQOBR9U,31992
 sksurv/tree/__init__.py,sha256=7RUjPZtGrVYiHY4roDXdEDM7RVBSsbY_CXWmyqZk2ts,64
-sksurv/tree/_criterion.cpython-311-darwin.so,sha256=wCdheIhvCFMLWylA1pGp0dUk6Rqv_OGEAf2i_x3JtjY,212704
-sksurv/ensemble/_coxph_loss.cpython-311-darwin.so,sha256=0cn1uvkDqXk4N69Z9NG6Uw8iXSOz5dpx5_ElhcDh0Bw,181456
+sksurv/tree/_criterion.cpython-311-darwin.so,sha256=z87Z2_tVuSnlt9LA_x3mZ2emKd2Is_mZz9nMZkZ9iLg,213792
+sksurv/ensemble/_coxph_loss.cpython-311-darwin.so,sha256=vR7CcvcTcD6JZzxEDjTasr4iPBbNpklQnrXPaMJ_AQs,181456
 sksurv/ensemble/boosting.py,sha256=zLsJdjgPuEunYzPy-xlsmdNAI2U97YnX6aWN3ksFIrM,61572
 sksurv/ensemble/__init__.py,sha256=7kZAzxFpJGtgLQfhoOqZUyGUubIs_Kw3RgyUsAd1Fq0,191
 sksurv/ensemble/survival_loss.py,sha256=mhIbuOqz7t-nuygswZD0d0are2R0EQ3d3yHMRdxOKIk,5942
 sksurv/ensemble/forest.py,sha256=zAo-Txbqc5GjnbfI5fJCUfUHG2NFdFS6dDQhADrBnuM,35268
 sksurv/kernels/clinical.py,sha256=oNIXgBIivmgjM927qNpspfI3HivC_ORqFvdsTb_NHTA,11452
 sksurv/kernels/__init__.py,sha256=_aZIFutv7kUTlkHJlP52zBDkpUXnKIlPPf3cikuAmCA,77
-sksurv/kernels/_clinical_kernel.cpython-311-darwin.so,sha256=Ll5PVKFZaBy9TrB0J8Gc2VZdFdixsjVc_wgxglpDqOg,192624
+sksurv/kernels/_clinical_kernel.cpython-311-darwin.so,sha256=44pt2uZ3dSbxyWNNsmMw6na53-kxvxyxDz_Lg04WuZ8,192624
 sksurv/bintrees/__init__.py,sha256=l6Fe4PAMByrABpGzZ5W8KHieEYG-rh-DADo2QiEMLrU,727
-sksurv/bintrees/_binarytrees.cpython-311-darwin.so,sha256=PWTAl3vNO5xWDqLcl3EwiW3we9JpPBba5f6Tijj-6yY,89368
+sksurv/bintrees/_binarytrees.cpython-311-darwin.so,sha256=c7o2ECeaKolZXlHHcezH2NrXXNwxGCqJsXLQEhDr7N0,89368
 sksurv/datasets/__init__.py,sha256=EPzJ50wd-cZ6mWuHFPRRRMqgt14WzM32HGxDrlOp9Q4,361
 sksurv/datasets/base.py,sha256=C9fnZJXLBTw1mvzc7GqGB4LdS6_8pQqPIAzKBo5jDpM,25622
 sksurv/datasets/data/cgvhd.arff,sha256=0lxUqY74JaMpC_vWJC4RWJy6vTmQwCg1yrUxjX65VX8,5214
@@ -38,7 +38,7 @@ sksurv/datasets/data/breast_cancer_GSE7390-metastasis.arff,sha256=Iz9MHAay7imf_8
 sksurv/datasets/data/flchain.arff,sha256=vyYA7EN90ZBx9zva2C3mgXgEV9EUHsNu1VGwAm5uV3M,343058
 sksurv/datasets/data/whas500.arff,sha256=9kBAyROYh1E3gi7KMGqScgjfaJaAjNl2SvcGVyL6U9Y,27772
 sksurv/datasets/data/veteran.arff,sha256=cdvJ4jXzzC7RCzolTjn5hcCSNG0chFc27SGxP74mNFY,5260
-sksurv/io/arffwrite.py,sha256=g7rVB3cuFwatFySle0AUhfB4oe3uW7KUsVMxjyGPur8,5435
+sksurv/io/arffwrite.py,sha256=klmpbAaksrOOPu0Ftl6cVwgEhQNTsv_Okxkjn9J2Wc0,5430
 sksurv/io/__init__.py,sha256=LacpKG9UKO_RefPXc6umPaGFGPOGzA-FZra_MCRWCxk,92
 sksurv/io/arffread.py,sha256=zc18B_CWVPr5_6Q_8IjohSmHL6rdTwTOsMqygyM945Y,2750
 sksurv/meta/__init__.py,sha256=VLA0VhLxZhF3z35md5Z4-nhw6BSSCfR6L7YOBGk1w1A,216
@@ -49,10 +49,10 @@ sksurv/linear_model/coxph.py,sha256=KFzVDP1TrNr9Hv08bCGsacTX0w_aE2jwsgMpCHe3R8A,
 sksurv/linear_model/__init__.py,sha256=58Lt5Tj3xGqRS4uZfVR5avKQNZubHD6RSknVDyzLTso,152
 sksurv/linear_model/coxnet.py,sha256=RgIomES97BcaM-RWmxmrP6AE3vkDaBsy4of727VsVfQ,22556
 sksurv/linear_model/aft.py,sha256=1Vn_V-e5ffQhbIed34MZzZBt4RzvAcLaxI1VTOZrBEY,7558
-sksurv/linear_model/_coxnet.cpython-311-darwin.so,sha256=pmKJ5KA_rxerJPUHBIyt6lXInrpSnnK-wwpTqVwgNaI,103160
+sksurv/linear_model/_coxnet.cpython-311-darwin.so,sha256=VD2r3SvWxwT1ytM1Gbg_selYB-bnKXtIwVwWWVVAqLI,103160
 sksurv/svm/naive_survival_svm.py,sha256=hx1C__lOT8hSV0g-YBI5reEgp9v4qQXOnvUlbVlHPwc,9319
 sksurv/svm/__init__.py,sha256=7BRFkatw9wbtsY-aes9cnz31VPpIjZ-383LuDmucDsw,328
 sksurv/svm/survival_svm.py,sha256=JGgUSft8p999DvZ0e617Ui2IEopt8kG3xspAJHt8CbU,44986
 sksurv/svm/minlip.py,sha256=B6nfOSxxWdXAB_Ym4AXxileEkyffVpRAnr34Yqvh9C8,24976
-sksurv/svm/_minlip.cpython-311-darwin.so,sha256=_qfpfUTteg4OxsaWx1ZluJhLKWvx7fNTgMSrk6SzziQ,190240
-sksurv/svm/_prsvm.cpython-311-darwin.so,sha256=N2ALsrqmnOY8qwMKKrk-EYKlrbqj4OdX47800Uc0c08,184576
+sksurv/svm/_minlip.cpython-311-darwin.so,sha256=bpQv6nKnKDnO2AZhcNvGtoBjYj_C-Wic0N_6YpIIdDM,190240
+sksurv/svm/_prsvm.cpython-311-darwin.so,sha256=gUZ9TljzSC_CIEClDxnQ8SR8UDp2X7iQOwLW56YOXjY,184576

{scikit_survival-0.26.0.dist-info → scikit_survival-0.27.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: false
 Tag: cp311-cp311-macosx_10_13_x86_64
 Generator: delocate 0.13.0

sksurv/io/arffwrite.py

@@ -172,7 +172,7 @@ def _write_data(data, fp):
             return "?"
         return str(x)
 
-    data = data.applymap(to_str)
+    data = data.map(to_str)
     n_rows = data.shape[0]
     for i in range(n_rows):
         str_values = list(data.iloc[i, :].apply(_check_str_array))

sksurv/metrics.py

@@ -510,7 +510,7 @@ def cumulative_dynamic_auc(survival_train, survival_test, estimate, times, tied_
             # to make sure that the curve starts at (0, 0)
             tp_no_ties = np.r_[0, tp_no_ties]
             fp_no_ties = np.r_[0, fp_no_ties]
-            scores[i] = np.trapz(tp_no_ties, fp_no_ties)
+            scores[i] = np.trapezoid(tp_no_ties, fp_no_ties)
 
     if n_times == 1:
         mean_auc = scores[0]
@@ -780,7 +780,7 @@ def integrated_brier_score(survival_train, survival_test, estimate, times):
         raise ValueError("At least two time points must be given")
 
     # Computing the IBS
-    ibs_value = np.trapz(brier_scores, times) / (times[-1] - times[0])
+    ibs_value = np.trapezoid(brier_scores, times) / (times[-1] - times[0])
 
     return ibs_value
 

sksurv/testing.py

@@ -119,7 +119,7 @@ class FixtureParameterFactory:
         return cases
 
 
-def check_module_minimum_version(module, version_str):
+def check_module_minimum_version(module, min_version_str, max_version_str=None):
     """
     Check whether a module of a specified minimum version is available.
 
@@ -127,8 +127,10 @@ def check_module_minimum_version(module, version_str):
     ----------
     module : str
         Name of the module.
-    version_str : str
+    min_version_str : str
         Minimum version of the module.
+    max_version_str : str, optional
+        Maximum version of the module (excluding).
 
     Returns
     -------
@@ -137,14 +139,17 @@ def check_module_minimum_version(module, version_str):
     """
     try:
         module_version = parse(version(module))
-        required_version = parse(version_str)
-        return module_version >= required_version
+        required_min_version = parse(min_version_str)
+        if max_version_str is None:
+            return module_version >= required_min_version
+        required_max_version = parse(max_version_str)
+        return required_min_version <= module_version < required_max_version
     except PackageNotFoundError:  # pragma: no cover
         return False
 
 
 def get_pandas_infer_string_context():
-    if check_module_minimum_version("pandas", "2.3.0"):
+    if check_module_minimum_version("pandas", "2.3.0", "3.0.0"):
         return (
             pytest.param(pd.option_context("future.infer_string", False), id="infer_string=False"),
             pytest.param(pd.option_context("future.infer_string", True), id="infer_string=True"),