Merge branch 'master' of gitlab.lis-lab.fr:dev/scikit-multimodallearn

.gitlab-ci.yml

@@ -4,6 +4,7 @@ tests:
     tags:
         - docker
     script:
+        - if [ -f requirements.txt ]; then pip3 install -r requirements.txt; fi
         - python3 setup.py install
         - pytest-3
     coverage: '/^TOTAL.+?(\d+\%)$/'
@@ -21,6 +22,7 @@ doc:
     script:
         - export LC_ALL=$(locale -a | grep en_US)
         - export LANG=$(locale -a | grep en_US)
+        - if [ -f requirements.txt ]; then pip3 install -r requirements.txt; fi
         - pip3 install -e .[doc]
         - rm -Rf build
         - python3 setup.py build_sphinx

setup.py

@@ -179,7 +179,7 @@ def setup_package():
     keywords = ['machine learning, supervised learning, classification, ensemble methods, boosting, kernel']
     packages = find_packages(exclude=['*.tests'])
     setup_requires = ['numpy']
-    install_requires = ['scikit-learn>=1.2.1', 'numpy', 'scipy', 'cvxopt' ]
+    install_requires = ['scikit-learn==1.2.1', 'numpy', 'scipy', 'cvxopt' ]
     python_requires = '>=3.6'
     extras_require = {
         'dev': ['pytest', 'pytest-cov'],