From fdb04c9dee5b1647d3f3d9f03be677d7dba1d2e1 Mon Sep 17 00:00:00 2001 From: NicolasGensollen Date: Tue, 8 Oct 2024 10:03:56 +0200 Subject: [PATCH 1/5] drop python 3.8 --- poetry.lock | 13 ++----------- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/poetry.lock b/poetry.lock index 7599d7299..42c813f08 100644 --- a/poetry.lock +++ b/poetry.lock @@ -23,8 +23,6 @@ files = [ ] [package.dependencies] -importlib-metadata = {version = "*", markers = "python_version < \"3.9\""} -importlib-resources = {version = "*", markers = "python_version < \"3.9\""} Mako = "*" SQLAlchemy = ">=1.3.0" typing-extensions = ">=4" @@ -87,9 +85,6 @@ files = [ {file = "Babel-2.14.0.tar.gz", hash = "sha256:6919867db036398ba21eb5c7a0f6b28ab8cbc3ae7a73a44ebe34ae74a4e7d363"}, ] -[package.dependencies] -pytz = {version = ">=2015.7", markers = "python_version < \"3.9\""} - [package.extras] dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] @@ -1772,7 +1767,6 @@ files = [ ] [package.dependencies] -importlib-resources = {version = ">=1.3", markers = "python_version < \"3.9\""} numpy = ">=1.20" packaging = ">=17" @@ -2640,7 +2634,6 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, - {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, @@ -2960,7 +2953,6 @@ files = [ [package.dependencies] markdown-it-py = ">=2.2.0" pygments = ">=2.13.0,<3.0.0" -typing-extensions = {version = ">=4.0.0,<5.0", markers = "python_version < \"3.9\""} [package.extras] jupyter = ["ipywidgets (>=7.5.1,<9)"] @@ -3836,7 +3828,6 @@ docker-pycreds = ">=0.4.0" GitPython = ">=1.0.0,<3.1.29 || >3.1.29" pathtools = "*" protobuf = [ - {version = ">=3.12.0,<4.21.0 || >4.21.0,<5", markers = "python_version < \"3.9\" and sys_platform == \"linux\""}, {version = ">=3.15.0,<4.21.0 || >4.21.0,<5", markers = "python_version == \"3.9\" and sys_platform == \"linux\""}, {version = ">=3.19.0,<4.21.0 || >4.21.0,<5", markers = "python_version > \"3.9\" or sys_platform != \"linux\""}, ] @@ -4027,5 +4018,5 @@ test = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-it [metadata] lock-version = "2.0" -python-versions = ">=3.8,<3.12" -content-hash = "3e97ad0f601217720d44712124f8f27a3086b7f7bcb2077921e7053eacc65800" +python-versions = ">=3.9,<3.12" +content-hash = "75b565c73ccd37aaabce0b4e0c21ec68ae9a217bbc068f9005e37a79ff4255e7" diff --git a/pyproject.toml b/pyproject.toml index 49dae38cd..d0938d992 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ ] [tool.poetry.dependencies] -python = ">=3.8,<3.12" +python = ">=3.9,<3.12" torch = "^2.1.0" torchvision = "*" tensorboard = "*" From 13a216cb44da254e5ad3443ed97b9b5807a839ed Mon Sep 17 00:00:00 2001 From: NicolasGensollen Date: Tue, 8 Oct 2024 10:04:34 +0200 Subject: [PATCH 2/5] do not recommend Python 3.8 in docs --- docs/Installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Installation.md b/docs/Installation.md index 3f8c7dc22..4ccf75640 100644 --- a/docs/Installation.md +++ b/docs/Installation.md @@ -30,7 +30,7 @@ bash /tmp/miniconda-installer.sh The latest release of ClinicaDL can be installed using `pip` as follows: ```{.sourceCode .bash} -conda create --name clinicadlEnv python=3.8 +conda create --name clinicadlEnv python=3.11 conda activate clinicadlEnv pip install clinicadl ``` From 7ad565b9db5999bfdbd8762ab2606fb5735e4511 Mon Sep 17 00:00:00 2001 From: NicolasGensollen Date: Tue, 8 Oct 2024 10:05:10 +0200 Subject: [PATCH 3/5] do not test with python 3.8 --- .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 219e86c2b..8327678b0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest] - python-version: ['3.8', '3.9', '3.10', '3.11'] + python-version: ['3.9', '3.10', '3.11'] steps: - uses: actions/checkout@v4 - uses: snok/install-poetry@v1 From abefa4bc0070aaa77a8f4962ceb5a0833e92e9cf Mon Sep 17 00:00:00 2001 From: NicolasGensollen Date: Tue, 8 Oct 2024 10:19:48 +0200 Subject: [PATCH 4/5] update requests --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 42c813f08..b5d84dbc3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2902,13 +2902,13 @@ files = [ [[package]] name = "requests" -version = "2.32.0" +version = "2.32.3" description = "Python HTTP for Humans." optional = false python-versions = ">=3.8" files = [ - {file = "requests-2.32.0-py3-none-any.whl", hash = "sha256:f2c3881dddb70d056c5bd7600a4fae312b2a300e39be6a118d30b90bd27262b5"}, - {file = "requests-2.32.0.tar.gz", hash = "sha256:fa5490319474c82ef1d2c9bc459d3652e3ae4ef4c4ebdd18a21145a47ca4b6b8"}, + {file = "requests-2.32.3-py3-none-any.whl", hash = "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6"}, + {file = "requests-2.32.3.tar.gz", hash = "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760"}, ] [package.dependencies] From 8cf6a6812c5343b98bbe8b07f4fd0c92cf72285b Mon Sep 17 00:00:00 2001 From: NicolasGensollen Date: Tue, 8 Oct 2024 10:34:10 +0200 Subject: [PATCH 5/5] bump python version in environment.yml --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 34f633da4..cc36c6c17 100644 --- a/environment.yml +++ b/environment.yml @@ -3,4 +3,4 @@ channels: - defaults - conda-forge dependencies: - - python=3.9 + - python=3.11