diff --git a/dwi_ml/data/processing/streamlines/post_processing.py b/dwi_ml/data/processing/streamlines/post_processing.py index 21356b83..28b15dff 100644 --- a/dwi_ml/data/processing/streamlines/post_processing.py +++ b/dwi_ml/data/processing/streamlines/post_processing.py @@ -8,7 +8,7 @@ from matplotlib.colors import LogNorm from mpl_toolkits.axes_grid1 import make_axes_locatable -from scilpy.tractanalysis.tools import \ +from scilpy.tractanalysis.connectivity_segmentation import \ extract_longest_segments_from_profile as segmenting_func from scilpy.tractograms.uncompress import uncompress diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..eb7967b0 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,7 @@ +# Minimal build configuration at detailed here: +# https://github.com/pypa/pip/issues/11457 + +[build-system] +requires = [ + "setuptools >= 64" +] \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 7739110b..0632cb29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,13 +8,13 @@ # ------- requests==2.28.* dipy==1.9.* -scilpy==2.0.2 +-e git+https://github.com/scilus/scilpy@24435143c507ca018dd7edf3447fd18004c62077#egg=scilpy # ------- # Other important dependencies # ------- bertviz==1.4.0 # For transformer's visu -torch==2.2.0 +torch==2.5.1 tqdm==4.64.* comet-ml>=3.22.0 contextlib2==21.6.0 @@ -28,9 +28,9 @@ pynvml>=11.5.0 # Necessary but should be installed with scilpy (Last check: 04/2024): # ------- future==0.18.* -h5py==3.7.* # h5py must absolutely be >2.4: that's when it became thread-safe +h5py==3.10.* # h5py must absolutely be >2.4: that's when it became thread-safe matplotlib==3.6.* # Hint: If matplotlib fails, you may try to install pyQt5. nibabel==5.2.* -numpy==1.23.* -scipy==1.9.* +numpy==1.25.* +scipy==1.11.* scikit-image==0.22.* diff --git a/setup.py b/setup.py index 192947b5..2966a59a 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,6 @@ version=VERSION, packages=find_packages(), python_requires=PYTHON_VERSION, - setup_requires=['numpy'], install_requires=external_dependencies, entry_points={ 'console_scripts': ["{}=scripts_python.{}:main".format(