diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 0e0fe4387fd1830d9b6efddb7b4fbc197e6027a0..eb10ca28b02290a72eab5ca28330cd02db774fb7 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -29,7 +29,6 @@ jobs: python -m pip install --upgrade pip setuptools wheel python -m pip install flake8 pytest pytest-cov if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - pip install git+https://github.com/thibgo/randomscm.git@v0.0.0-alpha - name: install summit run: | diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a05c371e869335c500a8200780263d033140804..2e809e11a6658b0fb25518bf91479c3de26f585e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ tests: - export LC_ALL=C.UTF-8 - export LANG=C.UTF-8 - if [ -f requirements.txt ]; then pip3 install -r requirements.txt; fi - - pip3 install -e .[install] + - pip3 install -e . - pip3 install -e .[test] - pytest --cov=. --cov-report=html coverage: '/^TOTAL.+?(\d+\%)$/' @@ -50,7 +50,6 @@ pages: - export LC_ALL=C.UTF-8 - export LANG=C.UTF-8 - if [ -f requirements.txt ]; then pip3 install -r requirements.txt; fi - - pip3 install git+https://github.com/thibgo/randomscm.git@v0.0.0-alpha - pip3 install -e .[test] - pip3 install -e .[doc] - pytest --cov=. --cov-report=html diff --git a/requirements.txt b/requirements.txt index 024dfd0d4d12586cda62fb5b1940edc7a572ce53..ff41c88e84fc4f1c64a167124512aed19c8a33ac 100755 --- a/requirements.txt +++ b/requirements.txt @@ -14,5 +14,6 @@ tabulate>=0.8.6 pyscm-ml>=1.0.0 imbalanced-learn>=0.10.1 scikit-multimodallearn==0.0.3 +randomscm==0.1.2 # Dépendances depuis des dépôts Git -# randomscm @ git+https://github.com/thibgo/randomscm.git@v0.0.0-alpha # pip install -e .[install] +# randomscm @ git+https://github.com/thibgo/randomscm.git@v0.0.0-alpha \ No newline at end of file diff --git a/setup.py b/setup.py index 4565716736869344f3b0ed5a5ce481dbeeaf12f8..d92c72e97af503ca6b1a232561ad3e4abc6dd9ca 100644 --- a/setup.py +++ b/setup.py @@ -150,8 +150,7 @@ def setup_package(): extras_require = { 'test' : ['pytest', 'pytest-cov'], 'doc' : ['sphinx >= 3.0.2', 'numpydoc', 'docutils', 'sphinx-autoapi', - 'sphinx_rtd_theme'], - 'install' : ['randomscm @ git+https://github.com/thibgo/randomscm.git@v0.0.0-alpha']} + 'sphinx_rtd_theme']} setup(version=version, diff --git a/summit/multiview_platform/monoview_classifiers/random_scm.py b/summit/multiview_platform/monoview_classifiers/random_scm.py index 97248c5515af0bbabeb4a596eed3af8759c8d969..df4efbe8389c9d7c631c696260fa8ffdb8660e09 100644 --- a/summit/multiview_platform/monoview_classifiers/random_scm.py +++ b/summit/multiview_platform/monoview_classifiers/random_scm.py @@ -119,7 +119,7 @@ class ScmBagging(RandomScmClassifier, BaseMonoviewClassifier): max_samples=max_samples, max_features=max_features, max_rules=max_rules, - p_options=p_options, + p=p_options, model_type=model_type, random_state=random_state) self.param_names = ["n_estimators", "max_rules", "max_samples", "max_features", "model_type", "p_options", "random_state"]