From fd2e56e3903638f080400463d4963a6af3757973 Mon Sep 17 00:00:00 2001 From: Ariel Rokem Date: Mon, 4 Nov 2024 14:13:04 -0800 Subject: [PATCH 1/5] Update minimal Python version Python 3.8 is no longer supported --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 40a7a56d..cb8ca0ee 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,7 +24,7 @@ platforms = OS Independent [options] setup_requires = setuptools_scm -python_requires = >=3.8 +python_requires = >=3.9 install_requires = # core packages scikit_image>=0.14.2 From d25b37398970713cdc94e60ae34c20a3e0531feb Mon Sep 17 00:00:00 2001 From: 36000 Date: Mon, 4 Nov 2024 15:41:44 -0800 Subject: [PATCH 2/5] update cloudknot examples --- examples/howto_examples/cloudknot_example.py | 4 ++-- examples/howto_examples/cloudknot_hcp_example.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/howto_examples/cloudknot_example.py b/examples/howto_examples/cloudknot_example.py index df5af437..1f82a3f0 100644 --- a/examples/howto_examples/cloudknot_example.py +++ b/examples/howto_examples/cloudknot_example.py @@ -114,7 +114,7 @@ def afq_process_subject(subject): knot = ck.Knot( name='afq-process-subject-201009-0', func=afq_process_subject, - base_image='python:3.8', + base_image='python:3.11', image_github_installs="https://github.com/tractometry/pyAFQ.git", pars_policies=('AmazonS3FullAccess',), bid_percentage=100) @@ -158,7 +158,7 @@ def afq_combine_profiles(dummy_argument): knot2 = ck.Knot( name='afq_combine_subjects-201009-0', func=afq_combine_profiles, - base_image='python:3.8', + base_image='python:3.11', image_github_installs="https://github.com/tractometry/pyAFQ.git", pars_policies=('AmazonS3FullAccess',), bid_percentage=100) diff --git a/examples/howto_examples/cloudknot_hcp_example.py b/examples/howto_examples/cloudknot_hcp_example.py index 1db42e48..9f25b88c 100644 --- a/examples/howto_examples/cloudknot_hcp_example.py +++ b/examples/howto_examples/cloudknot_hcp_example.py @@ -152,7 +152,7 @@ def attach_keys(list_of_arg_lists): knot = ck.Knot( name='afq-hcp-tractography-201110-0', func=afq_process_subject, - base_image='python:3.8', + base_image='python:3.11', image_github_installs="https://github.com/tractometry/pyAFQ.git", pars_policies=('AmazonS3FullAccess',), bid_percentage=100) @@ -193,7 +193,7 @@ def afq_combine_profiles(seed_mask, n_seeds): knot2 = ck.Knot( name='afq_combine_subjects-201110-0', func=afq_combine_profiles, - base_image='python:3.8', + base_image='python:3.11', image_github_installs="https://github.com/tractometry/pyAFQ.git", pars_policies=('AmazonS3FullAccess',), bid_percentage=100) From 2ae2b02725e0ab50097164eb5b15ea5b2f35453a Mon Sep 17 00:00:00 2001 From: Ariel Rokem Date: Mon, 4 Nov 2024 15:48:37 -0800 Subject: [PATCH 3/5] Upgrade to 3.9 in other places. --- docs/source/howto/installation_guide.rst | 2 +- pyafq_docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/howto/installation_guide.rst b/docs/source/howto/installation_guide.rst index c1195e23..9bf90da6 100644 --- a/docs/source/howto/installation_guide.rst +++ b/docs/source/howto/installation_guide.rst @@ -4,7 +4,7 @@ How to install ``pyAFQ`` ========================== -The ``pyAFQ`` software works (at least) on Python 3.9 and 3.8. +The ``pyAFQ`` software works (at least) on Python 3.9. How to install the release version ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pyafq_docker/Dockerfile b/pyafq_docker/Dockerfile index f4cea6fe..2100e0f7 100644 --- a/pyafq_docker/Dockerfile +++ b/pyafq_docker/Dockerfile @@ -3,7 +3,7 @@ ############################################################################### # Use python base image -FROM python:3.8 +FROM python:3.9 ARG COMMIT From 4eb25bec48a852dcb0ed2bd03559cc52e65b672b Mon Sep 17 00:00:00 2001 From: Ariel Rokem Date: Mon, 4 Nov 2024 15:51:16 -0800 Subject: [PATCH 4/5] Even more upgraded. --- docs/source/howto/installation_guide.rst | 2 +- pyafq_docker/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/howto/installation_guide.rst b/docs/source/howto/installation_guide.rst index 9bf90da6..2e254315 100644 --- a/docs/source/howto/installation_guide.rst +++ b/docs/source/howto/installation_guide.rst @@ -4,7 +4,7 @@ How to install ``pyAFQ`` ========================== -The ``pyAFQ`` software works (at least) on Python 3.9. +The ``pyAFQ`` software works (at least) on Python 3.10. How to install the release version ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/pyafq_docker/Dockerfile b/pyafq_docker/Dockerfile index 2100e0f7..47666b4c 100644 --- a/pyafq_docker/Dockerfile +++ b/pyafq_docker/Dockerfile @@ -1,9 +1,9 @@ ############################################################################### -# Dockerfile to build pyAFQ +# Dockerfile to build pyAFQ ############################################################################### # Use python base image -FROM python:3.9 +FROM python:3.11 ARG COMMIT From 596c20ef897208c3820db9fd08bfd5cdecadd3e1 Mon Sep 17 00:00:00 2001 From: Ariel Rokem Date: Mon, 4 Nov 2024 19:38:19 -0800 Subject: [PATCH 5/5] Actually, 3.9 is still supported. --- docs/source/howto/installation_guide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/howto/installation_guide.rst b/docs/source/howto/installation_guide.rst index 2e254315..9bf90da6 100644 --- a/docs/source/howto/installation_guide.rst +++ b/docs/source/howto/installation_guide.rst @@ -4,7 +4,7 @@ How to install ``pyAFQ`` ========================== -The ``pyAFQ`` software works (at least) on Python 3.10. +The ``pyAFQ`` software works (at least) on Python 3.9. How to install the release version ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~