Merge pull request scil-vital#202 from EmmaRenauld/requests

Fix requirements. Use fixed requests version

dwi_ml/info.py

@@ -52,5 +52,4 @@
 ISRELEASE = _version_extra == ''
 VERSION = __version__
 PROVIDES = ['dwi_ml']
-REQUIRES = ['nibabel',
-            'h5py']
+REQUIRES = []

requirements.txt

@@ -1,9 +1,11 @@
 # Supported for python 3.10
 # Should work for python > 3.8.
 
-
-# Scilpy must be installed manually first.
+# ----------
+# Scilpy and dipy must be installed manually first.
 # (or run pip install -r requirements_github.txt)
+# Not adding here to let you use your favorite version.
+# ----------
 
 bertviz~=1.4.0  # For transformer's visu
 torch==1.13.*
@@ -16,7 +18,7 @@ nested_lookup==0.2.25
 nose==1.3.*
 sphinx_rtd_theme==0.4.* # no longer a hard dependency since version 1.4.0
 
-## Necessary but should be installed with scilpy (Last check: 03/2023):
+## Necessary but should be installed with scilpy (Last check: 09/2023):
 future==0.18.*
 h5py==3.7.*   # 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.
@@ -25,9 +27,13 @@ numpy==1.23.*
 scipy==1.9.*
 
 
+# Scilpy requires requests==2.28.*, but comet_ml requires requests>=2.18.*,
+# which installs a version >2.28. Adding request version explicitely.
+requests==2.28.*
 
 
 # --------------- Notes to developers
-# 1. If we upgrade torch, verify if code copied in
-#    models.projects.transformers_from_torch has changed.
-#    (current code copied from torch 1.13.1)
+# If we upgrade torch, verify if code copied in
+#     models.projects.transformers_from_torch has changed.
+# (current code copied from torch 1.13.1)
+# ----------

requirements_github.txt

@@ -1,11 +1,16 @@
-# Bug Cython. We can't install the master scilpy. :(
 
-# But scilpy works currently with :
+git+https://github.com/EmmaRenauld/scilpy.git@master#egg=scilpy
+# Will install dipy through requirements.
+
+
+
+# ---------------
+# Note to developpers
+# In case scilpy reverts to hot dipy one day:
+# Previous hot dipy led to errors, and we prefered keeping official dipy:
+# We had to use Emmanuelle Renauld's branch of scilpy, with hot dipy skipped.
+#
 # -e git+https://github.com/scilus/[email protected]#egg=dipy
 # --> issue with -e: pytest seems to redo ALL tests.
 # --> issue without e: bug with Cython. Arnaud and Francois from scilpy
-#     couldn't help. Using official dipy instead of hot dipy:
-#     Emmanuelle Renauld's branch of scilpy, with hot dipy skipped.
-git+https://github.com/EmmaRenauld/scilpy.git@master#egg=scilpy
-
-# Will install dipy.
+#     couldn't help.