From 21b472ae972b7752e1b92188c9c6e5ee04b68d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Sun, 29 Sep 2024 22:07:56 +0100 Subject: [PATCH 1/9] py313 --- .github/workflows/test.yml | 4 ++-- pyproject.toml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6e9aae066..f4030bdc4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -68,7 +68,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-rc.2"] os: [ubuntu-latest, windows-latest, macOS-13] runs-on: ${{ matrix.os }} steps: @@ -107,7 +107,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-rc.2"] os: [ubuntu-latest, windows-latest, macOS-13] runs-on: ${{ matrix.os }} steps: diff --git a/pyproject.toml b/pyproject.toml index 0086b2ed7..cb92117cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,13 +35,14 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", ] -requires-python = ">=3.9,<3.13" +requires-python = ">=3.9,<3.14" dependencies = [ "numpy>=1.21.0,<2.2", "pandas>=1.1.0,<2.3.0", "packaging", - "scikit-base>=0.6.1,<0.10.0", + "scikit-base>=0.6.1,<0.11.0", "scikit-learn>=0.24.0,<1.6.0", "scipy<2.0.0,>=1.2.0", ] From 211894f388fc0027afa198cf65749edb8e96137a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Sun, 29 Sep 2024 22:28:10 +0100 Subject: [PATCH 2/9] Update test.yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f4030bdc4..f5862981e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -68,7 +68,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-rc.2"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13.0-rc.2"] os: [ubuntu-latest, windows-latest, macOS-13] runs-on: ${{ matrix.os }} steps: @@ -107,7 +107,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13.0-rc.2"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13.0-rc.2"] os: [ubuntu-latest, windows-latest, macOS-13] runs-on: ${{ matrix.os }} steps: From 00ae5ab888671da922f9a96e1074c2ba617ada9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Thu, 3 Oct 2024 19:58:22 +0100 Subject: [PATCH 3/9] Update test.yml --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f5862981e..29d0bc779 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -68,7 +68,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13.0-rc.2"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13.0-rc.3"] os: [ubuntu-latest, windows-latest, macOS-13] runs-on: ${{ matrix.os }} steps: @@ -107,7 +107,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13.0-rc.2"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13.0-rc32"] os: [ubuntu-latest, windows-latest, macOS-13] runs-on: ${{ matrix.os }} steps: From a426462af76913d2d004cf7effa9af0cfaf68c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Fri, 4 Oct 2024 18:49:01 +0100 Subject: [PATCH 4/9] typo --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 29d0bc779..d25cf5515 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -107,7 +107,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13.0-rc32"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13.0-rc.3"] os: [ubuntu-latest, windows-latest, macOS-13] runs-on: ${{ matrix.os }} steps: From 814861f3ca58cc3c997fa5771e6f1145b55d2b7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Tue, 8 Oct 2024 21:48:02 +0100 Subject: [PATCH 5/9] 3.13 full in CI --- .github/workflows/test.yml | 4 ++-- .github/workflows/wheels.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d25cf5515..d28eda45c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -68,7 +68,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13.0-rc.3"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] os: [ubuntu-latest, windows-latest, macOS-13] runs-on: ${{ matrix.os }} steps: @@ -107,7 +107,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.9", "3.10", "3.11", "3.12", "3.13.0-rc.3"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] os: [ubuntu-latest, windows-latest, macOS-13] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index c3a870ec6..8383b1e85 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -35,7 +35,7 @@ jobs: fail-fast: false # to not fail all combinations if just one fail matrix: os: [ubuntu-latest, macOS-13] - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 @@ -66,7 +66,7 @@ jobs: fail-fast: false # to not fail all combinations if just one fail matrix: os: [windows-latest] - python-version: ['3.9', '3.10', '3.11', '3.12'] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] steps: - uses: actions/checkout@v4 From 69b2e90882c3de26e27d13b8921eb19455dcc632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Wed, 9 Oct 2024 01:16:50 +0100 Subject: [PATCH 6/9] deps --- pyproject.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8dd81be12..4f1575709 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,6 @@ dependencies = [ [project.optional-dependencies] all_extras = [ - "attrs", "cyclic-boosting>=1.4.0; python_version < '3.12'", "distfit", "lifelines<0.30.0", @@ -58,10 +57,8 @@ all_extras = [ "ngboost<0.6.0", "polars<1.10.0", "pyarrow<14.0.0; python_version < '3.12'", - "scikit-survival<0.24.0", + "scikit-survival<0.24.0; python_version < '3.13'", "statsmodels>=0.12.1", - "tabulate", - "uncertainties", ] dev = [ From a66faa92cff7f958072c591d8fc6a5de1df92ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Wed, 9 Oct 2024 01:28:08 +0100 Subject: [PATCH 7/9] scattershot --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4f1575709..7efe98b25 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -50,11 +50,11 @@ dependencies = [ [project.optional-dependencies] all_extras = [ "cyclic-boosting>=1.4.0; python_version < '3.12'", - "distfit", - "lifelines<0.30.0", - "mapie", + "distfit; python_version < '3.13'", + "lifelines<0.30.0; python_version < '3.13'", + "mapie; python_version < '3.13'", "matplotlib>=3.3.2", - "ngboost<0.6.0", + "ngboost<0.6.0; python_version < '3.13'", "polars<1.10.0", "pyarrow<14.0.0; python_version < '3.12'", "scikit-survival<0.24.0; python_version < '3.13'", From 5b14582d7f17a3e593c5962e57ab357cccdd7322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Wed, 9 Oct 2024 01:48:32 +0100 Subject: [PATCH 8/9] macos-latest --- .github/workflows/test.yml | 2 +- .github/workflows/wheels.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6e9aae066..b91ac1f36 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -108,7 +108,7 @@ jobs: fail-fast: false matrix: python-version: ['3.9', '3.10', '3.11', '3.12'] - os: [ubuntu-latest, windows-latest, macOS-13] + os: [ubuntu-latest, windows-latest, macOS-latest] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index c3a870ec6..e102b5ddb 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false # to not fail all combinations if just one fail matrix: - os: [ubuntu-latest, macOS-13] + os: [ubuntu-latest, macOS-latest] python-version: ['3.9', '3.10', '3.11', '3.12'] steps: From 0a77f5b99f3b2ad127d942bad88268f1f22ce830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20Kir=C3=A1ly?= Date: Wed, 9 Oct 2024 01:56:32 +0100 Subject: [PATCH 9/9] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 314ee48fe..d88538171 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -69,7 +69,7 @@ jobs: fail-fast: false matrix: python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] - os: [ubuntu-latest, windows-latest, macOS-13] + os: [ubuntu-latest, windows-latest, macOS-latest] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4