Merge pull request #143 from jhlegarreta/mnt/upgrade-python-min-version

MNT: Upgrade Python required minimum versions

Author: jhlegarreta

.github/workflows/check_format.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.8]
+        python-version: [3.12]
         requires: ['latest']
 
     steps:

.github/workflows/test_package.yml

@@ -11,7 +11,7 @@ jobs:
       # max-parallel: 6
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.8]
+        python-version: ['3.12']
         requires: ['minimal', 'latest']
 
     steps:

dmriseg/data/lut/utils.py

@@ -9,13 +9,7 @@
 import importlib_resources
 import pandas as pd
 import requests
-from SUITPy import (
-    fetch_buckner_2011,
-    fetch_diedrichsen_2009,
-    fetch_ji_2019,
-    fetch_king_2019,
-    fetch_xue_2021,
-)
+from SUITPy.atlas import fetch_atlas
 from SUITPy.utils import _fetch_files, _get_dataset_dir
 
 from dmriseg._utils import fill_doc
@@ -220,15 +214,15 @@ def fetch_suit_atlas(atlas, **kwargs):
         _data = kwargs.pop(data_arg, _data)
 
     if atlas == Atlas.BUCKNER:
-        atlas_data = fetch_buckner_2011(**kwargs)
+        atlas_data = fetch_atlas("Buckner_2011", **kwargs)
     elif atlas == Atlas.DIEDRICHSEN:
-        atlas_data = fetch_diedrichsen_2009(**kwargs)
+        atlas_data = fetch_atlas("Diedrichsen_2009", **kwargs)
     elif atlas == Atlas.JI:
-        atlas_data = fetch_ji_2019(**kwargs)
+        atlas_data = fetch_atlas("Ji_2019", **kwargs)
     elif atlas == Atlas.KING:
-        atlas_data = fetch_king_2019(data=_data, **kwargs)
+        atlas_data = fetch_atlas("King_2019", data=_data, **kwargs)
     elif atlas == Atlas.XUE:
-        atlas_data = fetch_xue_2021(**kwargs)
+        atlas_data = fetch_atlas("Xue_2021", **kwargs)
     else:
         raise ValueError(f"Unknown atlas name: {atlas}.")
 
@@ -285,7 +279,7 @@ def fetch_suit_cmap_lut_files(
     # name matching the URL
     dataset_name = atlas_dirname.value.lower()
     data_dir = _get_dataset_dir(
-        dataset_name, data_dir=data_dir, verbose=verbose
+        dataset_name, atlas_dir=data_dir, verbose=verbose
     )
 
     # Get local fullpath(s) of downloaded file(s)

dmriseg/models/tests/test_models.py

@@ -8,7 +8,7 @@
 
 def test_unet():
     # A full forward pass
-    x = torch.randn(1, 32)
+    x = torch.randn(1, 1, 32, 32)
     model = UNet()
     y = model(x)
 

pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
     "seg-metrics",
     "statannotations",
     "statsmodels",
-    "SUITPy",
+    "SUITPy @ git+https://github.com/DiedrichsenLab/SUITPy.git@728f7d9bd2d1d078800768311fb144151c2c8647",
     "torch",
     "tqdm",
 ]
@@ -45,7 +45,7 @@ maintainers = [
 ]
 name = "dmriseg"
 version = "0.0.1"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 
 
 [project.optional-dependencies]