From 6854b13d7b3416ca1c333cfc20bd738decd47a4d Mon Sep 17 00:00:00 2001 From: Xavier Dupre Date: Sun, 16 Jul 2023 16:39:16 +0200 Subject: [PATCH 01/12] master to main --- README.rst | 10 +++++----- _doc/sphinxdoc/source/c_algo/gest.rst | 2 +- _doc/sphinxdoc/source/conf.py | 1 + _doc/sphinxdoc/source/index.rst | 10 +++++----- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README.rst b/README.rst index a2abbe19..254764a0 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,5 @@ -.. image:: https://travis-ci.com/sdpython/mlstatpy.svg?branch=master +.. image:: https://travis-ci.com/sdpython/mlstatpy.svg?branch=main :target: https://app.travis-ci.com/github/sdpython/mlstatpy :alt: Build status @@ -7,8 +7,8 @@ :target: https://ci.appveyor.com/project/sdpython/mlstatpy :alt: Build Status Windows -.. image:: https://circleci.com/gh/sdpython/mlstatpy/tree/master.svg?style=svg - :target: https://circleci.com/gh/sdpython/mlstatpy/tree/master +.. image:: https://circleci.com/gh/sdpython/mlstatpy/tree/main.svg?style=svg + :target: https://circleci.com/gh/sdpython/mlstatpy/tree/main .. image:: https://badge.fury.io/py/mlstatpy.svg :target: https://pypi.org/project/mlstatpy/ @@ -17,8 +17,8 @@ :alt: MIT License :target: http://opensource.org/licenses/MIT -.. image:: https://codecov.io/github/sdpython/mlstatpy/coverage.svg?branch=master - :target: https://codecov.io/github/sdpython/mlstatpy?branch=master +.. image:: https://codecov.io/github/sdpython/mlstatpy/coverage.svg?branch=main + :target: https://codecov.io/github/sdpython/mlstatpy?branch=main .. image:: http://img.shields.io/github/issues/sdpython/mlstatpy.png :alt: GitHub Issues diff --git a/_doc/sphinxdoc/source/c_algo/gest.rst b/_doc/sphinxdoc/source/c_algo/gest.rst index 5505dec7..99bcfdf6 100644 --- a/_doc/sphinxdoc/source/c_algo/gest.rst +++ b/_doc/sphinxdoc/source/c_algo/gest.rst @@ -53,7 +53,7 @@ Explications ============ La présentation -`Détection des images dans les images digitales `_ +`Détection des images dans les images digitales `_ détaille le principe de l'algorithme. L'idée de l'algorithme est assez proche de la `transformée de Hough `_. Celle-ci est implémentée dans le module diff --git a/_doc/sphinxdoc/source/conf.py b/_doc/sphinxdoc/source/conf.py index 9ccee104..6f6433df 100644 --- a/_doc/sphinxdoc/source/conf.py +++ b/_doc/sphinxdoc/source/conf.py @@ -120,6 +120,7 @@ "PiecewiseTreeRegressor": "http://www.xavierdupre.fr/app/mlinsights/helpsphinx/mlinsights/mlmodel/" "piecewise_tree_regression.html#mlinsights.mlmodel.piecewise_tree_regression.PiecewiseTreeRegressor", "Predictable t-SNE": "http://www.xavierdupre.fr/app/mlinsights/helpsphinx/notebooks/predictable_tsne.html", + "QuantileLinearRegression": "http://www.xavierdupre.fr/app/mlinsights/helpsphinx/mlinsights/mlmodel/quantile_regression.html#mlinsights.mlmodel.quantile_regression.QuantileLinearRegression", "R-tree": "https://en.wikipedia.org/wiki/R-tree", "R* tree": "https://en.wikipedia.org/wiki/R*_tree", "Regression with confidence interval": "http://www.xavierdupre.fr/app/mlinsights/helpsphinx/notebooks/regression_confidence_interval.html", diff --git a/_doc/sphinxdoc/source/index.rst b/_doc/sphinxdoc/source/index.rst index 95c99798..0dc6de89 100644 --- a/_doc/sphinxdoc/source/index.rst +++ b/_doc/sphinxdoc/source/index.rst @@ -38,7 +38,7 @@ Xavier Dupré .. only:: html - .. image:: https://travis-ci.com/sdpython/mlstatpy.svg?branch=master + .. image:: https://travis-ci.com/sdpython/mlstatpy.svg?branch=main :target: https://app.travis-ci.com/github/sdpython/mlstatpy :alt: Build status @@ -46,8 +46,8 @@ Xavier Dupré :target: https://ci.appveyor.com/project/sdpython/mlstatpy :alt: Build Status Windows - .. image:: https://circleci.com/gh/sdpython/mlstatpy/tree/master.svg?style=svg - :target: https://circleci.com/gh/sdpython/mlstatpy/tree/master + .. image:: https://circleci.com/gh/sdpython/mlstatpy/tree/main.svg?style=svg + :target: https://circleci.com/gh/sdpython/mlstatpy/tree/main .. image:: https://badge.fury.io/py/mlstatpy.svg :target: https://pypi.org/project/mlstatpy/ @@ -56,8 +56,8 @@ Xavier Dupré :alt: MIT License :target: http://opensource.org/licenses/MIT - .. image:: https://codecov.io/github/sdpython/mlstatpy/coverage.svg?branch=master - :target: https://codecov.io/github/sdpython/mlstatpy?branch=master + .. image:: https://codecov.io/github/sdpython/mlstatpy/coverage.svg?branch=main + :target: https://codecov.io/github/sdpython/mlstatpy?branch=main .. image:: http://img.shields.io/github/issues/sdpython/mlstatpy.png :alt: GitHub Issues From 6bd2c7e1ef5d93b7f78a42cef093f762858762b4 Mon Sep 17 00:00:00 2001 From: Xavier Dupre Date: Sun, 16 Jul 2023 16:44:51 +0200 Subject: [PATCH 02/12] rdev --- .github/workflows/documentation.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index dcc6d513..4b4aeb7c 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -36,9 +36,6 @@ jobs: - name: Install requirements run: python -m pip install -r requirements.txt - - name: Install requirements-dev.txt - run: python -m pip install -r requirements-dev.txt - - name: Install run: python -m pip install -e . From e5fcaaf9c4f5a4c01be827c55b847313f7430987 Mon Sep 17 00:00:00 2001 From: Xavier Dupre Date: Sun, 16 Jul 2023 16:54:08 +0200 Subject: [PATCH 03/12] setup --- .github/workflows/documentation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 4b4aeb7c..1f4ace84 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -36,8 +36,8 @@ jobs: - name: Install requirements run: python -m pip install -r requirements.txt - - name: Install - run: python -m pip install -e . + #- name: Install + # run: python -m pip install -e . - name: Documentation run: python -m sphinx ./_doc ./dist/html From 63c33258908ee6da15bdd7c4eea39a2082f4adc3 Mon Sep 17 00:00:00 2001 From: Xavier Dupre Date: Sun, 16 Jul 2023 17:03:17 +0200 Subject: [PATCH 04/12] ci --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 1f4ace84..e5eb6766 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -40,7 +40,7 @@ jobs: # run: python -m pip install -e . - name: Documentation - run: python -m sphinx ./_doc ./dist/html + run: python -m sphinx ./_doc/sphinxdoc/source ./dist/html - uses: actions/upload-artifact@v3 with: From c72809b9961a040fad8d81337f73dfdec0674530 Mon Sep 17 00:00:00 2001 From: Xavier Dupre Date: Sun, 16 Jul 2023 17:09:47 +0200 Subject: [PATCH 05/12] req --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 04a5a9f1..049d6aae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,7 +40,7 @@ snakeviz scikit-learn>=1.1 git+https://github.com/onnx/sklearn-onnx.git sphinx -sphinx-bootstrap-theme +sphinx_gallery sphinxcontrib.imagesvg stack_data statsmodels From 1761f62e676678dc171ed7a92fe69fdf602fe94e Mon Sep 17 00:00:00 2001 From: Xavier Dupre Date: Sun, 16 Jul 2023 17:19:01 +0200 Subject: [PATCH 06/12] opy --- .github/workflows/documentation.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index e5eb6766..7a7368b1 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -38,6 +38,10 @@ jobs: #- name: Install # run: python -m pip install -e . + - name: Copy license + run: cp LICENSE* ./_doc/sphinxdoc/source + - name: Copy readme + run: cp README* ./_doc/sphinxdoc/source - name: Documentation run: python -m sphinx ./_doc/sphinxdoc/source ./dist/html From 8d8afd9f234eebe461953a640bf13f6774b07b4f Mon Sep 17 00:00:00 2001 From: Xavier Dupre Date: Sun, 16 Jul 2023 17:28:43 +0200 Subject: [PATCH 07/12] rst --- .github/workflows/documentation.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 7a7368b1..e9c8b0e3 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -43,8 +43,10 @@ jobs: - name: Copy readme run: cp README* ./_doc/sphinxdoc/source + #- name: Documentation + # run: python -m sphinx ./_doc/sphinxdoc/source ./dist/html - name: Documentation - run: python -m sphinx ./_doc/sphinxdoc/source ./dist/html + run: python setup build_sphinx - uses: actions/upload-artifact@v3 with: From f7374bbe267ed25c669260ce9a37cb5516b3a40e Mon Sep 17 00:00:00 2001 From: Xavier Dupre Date: Sun, 16 Jul 2023 17:34:32 +0200 Subject: [PATCH 08/12] rst --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index e9c8b0e3..10a9c3d1 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -46,7 +46,7 @@ jobs: #- name: Documentation # run: python -m sphinx ./_doc/sphinxdoc/source ./dist/html - name: Documentation - run: python setup build_sphinx + run: python setup.py build_sphinx - uses: actions/upload-artifact@v3 with: From 6f8b7f1e4e073ff70f9ac5a209563c7e7e633af6 Mon Sep 17 00:00:00 2001 From: Xavier Dupre Date: Sun, 16 Jul 2023 17:46:41 +0200 Subject: [PATCH 09/12] rst --- .github/workflows/documentation.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 10a9c3d1..aa9871da 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -33,6 +33,9 @@ jobs: with: python-version: '3.11' + - name: Install pandoc + run: apt-get install -y pandoc + - name: Install requirements run: python -m pip install -r requirements.txt From b4553d5e6b438d395cb8177e7312f3888227b7b2 Mon Sep 17 00:00:00 2001 From: Xavier Dupre Date: Sun, 16 Jul 2023 17:52:23 +0200 Subject: [PATCH 10/12] rst --- .github/workflows/documentation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index aa9871da..467680f3 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -34,7 +34,7 @@ jobs: python-version: '3.11' - name: Install pandoc - run: apt-get install -y pandoc + run: sudo apt-get install -y pandoc - name: Install requirements run: python -m pip install -r requirements.txt From abee9b3f21f1dfffa82182321f6c52d979b4c4c3 Mon Sep 17 00:00:00 2001 From: Xavier Dupre Date: Sun, 16 Jul 2023 18:00:15 +0200 Subject: [PATCH 11/12] setup --- setup.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/setup.py b/setup.py index db2632e3..23d9976e 100644 --- a/setup.py +++ b/setup.py @@ -3,6 +3,7 @@ import os from setuptools import find_packages, setup from pyquicksetup import read_version, read_readme, default_cmdclass +from pyquicksetup.pyquick import _SetupCommand ######### # settings @@ -37,6 +38,38 @@ package_data = {} +class SetupCommandSphinx(_SetupCommand): + description = "Builds documentation." + + user_options = [ + ("layout=", None, "format generation, default is html,rst."), + ( + "nbformats=", + None, + "format generation, default is ipynb,slides,html,python,rst,github", + ), + ] + + def initialize_options(self): + self.layout = "html,rst" + self.nbformats = "ipynb,html,python,rst,github" + + def finalize_options(self): + pass + + def run(self): + from pyquickhelper.pycode import process_standard_options_for_setup + + parameters = self.get_parameters() + parameters["argv"] = ["build_sphinx"] + parameters["layout"] = self.layout.split(",") + parameters["nbformats"] = self.nbformats.split(",") + process_standard_options_for_setup(**parameters) + + +defcla = default_cmdclass().copy() +defcla["build_sphinx"] = SetupCommandSphinx + setup( name=project_var_name, version=read_version(__file__, project_var_name), From 26070b65922b507be93ca2feb748c8b8b145bca4 Mon Sep 17 00:00:00 2001 From: Xavier Dupre Date: Sun, 16 Jul 2023 18:05:05 +0200 Subject: [PATCH 12/12] setup --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 23d9976e..b973ee73 100644 --- a/setup.py +++ b/setup.py @@ -80,7 +80,7 @@ def run(self): download_url=f"https://github.com/sdpython/{project_var_name}/", description=DESCRIPTION, long_description=read_readme(__file__), - cmdclass=default_cmdclass(), + cmdclass=defcla, keywords=KEYWORDS, classifiers=CLASSIFIERS, packages=packages,