diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index b59eebdde2cfd9a30bc56e79d6ca4cccae885031..0e0fe4387fd1830d9b6efddb7b4fbc197e6027a0 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -30,7 +30,7 @@ jobs: 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 - pip install git+https://github.com/multi-learn/scikit-multimodallearn.git + - name: install summit run: | pip install -e . diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c6221ad589d7e5a0acaa8f091c39b4b38a5f194..3a05c371e869335c500a8200780263d033140804 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 . + - pip3 install -e .[install] - pip3 install -e .[test] - pytest --cov=. --cov-report=html coverage: '/^TOTAL.+?(\d+\%)$/' @@ -28,7 +28,6 @@ doc: - 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 git+https://github.com/multi-learn/scikit-multimodallearn.git - pip3 install -e .[doc] - sphinx-apidoc -o docs/source summit - cd docs/source @@ -52,7 +51,6 @@ pages: - 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 git+https://github.com/multi-learn/scikit-multimodallearn.git - pip3 install -e .[test] - pip3 install -e .[doc] - pytest --cov=. --cov-report=html diff --git a/MANIFEST.in b/MANIFEST.in index 982ae2757d5cc05fa4463ed25d5422460487ce60..1ec2150406ad0ed50bdf45cb675a9da2a2db94de 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ include *.md include multiview_platform/examples* +include VERSION include LICENSE \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 7859ba8fa83bd235fdb64c92ccce82bcf585cf17..bb256c7be8e49984983a4632b4150f87cec92913 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,6 @@ classifiers=[ 'Programming Language :: Python :: 3.11', 'Topic :: Scientific/Engineering', 'Topic :: Scientific/Engineering :: Artificial Intelligence', - 'Topic :: Machine Learning', 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX :: Linux', 'Operating System :: MacOS :: MacOS X', @@ -39,7 +38,7 @@ doc = ['sphinx >= 3.0.2', 'numpydoc', 'docutils', 'sphinx-autoapi', [project.urls] "Sources" = 'https://github.com/multi-learn/summit' Documentation = 'https://multi-learn.github.io/summit/' -"Bug Tracker" = '"https://github.com/multi-learn/summit/issues' +"Bug Tracker" = 'https://github.com/multi-learn/summit/issues' [tool.setuptools.dynamic] dependencies = {file = ["requirements.txt"]} diff --git a/requirements.txt b/requirements.txt index 26ba119e83c826deba552037f3da2c12e8ea7c05..024dfd0d4d12586cda62fb5b1940edc7a572ce53 100755 --- a/requirements.txt +++ b/requirements.txt @@ -15,4 +15,4 @@ pyscm-ml>=1.0.0 imbalanced-learn>=0.10.1 scikit-multimodallearn==0.0.3 # Dépendances depuis des dépôts Git -randomscm @ git+https://github.com/thibgo/randomscm.git@v0.0.0-alpha +# randomscm @ git+https://github.com/thibgo/randomscm.git@v0.0.0-alpha # pip install -e .[install] diff --git a/setup.py b/setup.py index 0320d970f6c582a1d1b80f9d90a8f3677ba0e409..4565716736869344f3b0ed5a5ce481dbeeaf12f8 100644 --- a/setup.py +++ b/setup.py @@ -150,7 +150,9 @@ def setup_package(): extras_require = { 'test' : ['pytest', 'pytest-cov'], 'doc' : ['sphinx >= 3.0.2', 'numpydoc', 'docutils', 'sphinx-autoapi', - 'sphinx_rtd_theme']} + 'sphinx_rtd_theme'], + 'install' : ['randomscm @ git+https://github.com/thibgo/randomscm.git@v0.0.0-alpha']} + setup(version=version, packages=packages,