documentation and style

sdpython · May 21, 2018 · 2d0e00e · 2d0e00e
1 parent beaeaca
commit 2d0e00e
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -59,8 +59,7 @@ install:
   # - make all
   #- conda build build_tools/conda-recipe --quiet
   - conda install -q --file=requirements_conda.txt
-  - conda install -c conda-forge xgboost
-  - pip install pyquickhelper jyquickhelper
+  - pip install pyquickhelper>=1.8 jyquickhelper
   - pip install -r requirements.txt
   - pip install -U git+https://github.com/sdpython/pyPdf --no-deps
   - pip install -U git+https://github.com/matplotlib/natgrid --no-deps
@@ -72,5 +71,6 @@ install:
   - pip install torchvision
   - pip install cairocffi cairosvg
   - pip install git+https://github.com/matplotlib/basemap.git
+  - conda install -q -c conda-forge xgboost
 script:
   - python setup.py unittests
diff --git a/_doc/sphinxdoc/source/ci_status.rst b/_doc/sphinxdoc/source/ci_status.rst
@@ -14,7 +14,7 @@ Tableau de bord et statut des dépendances
 +++++++++++++++++++++++++++++++++++++++++
 
 .. list-table::
-    :widths: 12 10 10 8 15 10 10 10 10
+    :widths: 12 10 10 8 15 10 10 10 10 10
     :header-rows: 1
 
     * - Module
@@ -96,6 +96,29 @@ Tableau de bord et statut des dépendances
             :target: http://www.xavierdupre.fr/app/csharpy/helpsphinx/all_notebooks_coverage.html
             :alt: Notebook Coverage
       -
+    * - `csharpyml <http://www.xavierdupre.fr/app/csharpyml/helpsphinx/index.html>`_
+      - .. image:: https://travis-ci.org/sdpython/csharpyml.svg?branch=master
+            :target: https://travis-ci.org/sdpython/csharpyml
+            :alt: Build status
+      - .. image:: https://ci.appveyor.com/api/projects/status/ldrgt6sxeyfwtoo2?svg=true
+            :target: https://ci.appveyor.com/project/sdpython/csharpyml
+            :alt: Build Status Windows
+      - .. image:: https://circleci.com/gh/sdpython/csharpyml/tree/master.svg?style=svg
+            :target: https://circleci.com/gh/sdpython/csharpyml/tree/master
+      - .. image:: https://badge.fury.io/py/csharpyml.svg
+            :target: https://pypi.org/project/csharpyml
+      - .. image:: http://img.shields.io/pypi/pyversions/csharpyml.png
+            :alt: PYPI Package
+            :target: https://pypi.python.org/pypi/csharpyml
+      - .. image:: https://badge.waffle.io/sdpython/csharpyml.png?label=to%20do&title=to%20do
+            :alt: Waffle
+            :target: https://waffle.io/sdpython/csharpyml
+      - .. image:: https://codecov.io/github/sdpython/csharpyml/coverage.svg?branch=master
+            :target: https://codecov.io/github/sdpython/csharpyml?branch=master
+      - .. image:: http://www.xavierdupre.fr/app/csharpyml/helpsphinx/_images/nbcov.png
+            :target: http://www.xavierdupre.fr/app/csharpyml/helpsphinx/all_notebooks_coverage.html
+            :alt: Notebook Coverage
+      -
     * - `cpyquickhelper <http://www.xavierdupre.fr/app/cpyquickhelper/helpsphinx/index.html>`_
       - .. image:: https://travis-ci.org/sdpython/cpyquickhelper.svg?branch=master
             :target: https://travis-ci.org/sdpython/cpyquickhelper
@@ -630,6 +653,7 @@ Tableau de bord et statut des dépendances
       -
       -
       -
+      -
     * - `python3_module_template <http://www.xavierdupre.fr/app/python3_module_template/helpsphinx/index.html>`_
       - .. image:: https://travis-ci.org/sdpython/python3_module_template.svg?branch=master
             :target: https://travis-ci.org/sdpython/python3_module_template
@@ -702,9 +726,11 @@ Outils
 
     * - module
       - description
-    * - `csharpy <http://www.xavierdupre.fr/app/csharpy/helpsphinx/index.html>`_
-      - Outils, exemplesp pour utiliser du :epkg:`C#` depuis :epkg:`Python`
+    * - :epkg:`csharpy`
+      - Outils, exemples pour utiliser du :epkg:`C#` depuis :epkg:`Python`
         sous Windows ou Linux.
+    * - :epkg:`csharpyml`
+      - :epkg:`csharpy` + :epkg:`ML.net`
     * - `cpyquickhelper <http://www.xavierdupre.fr/app/cpyquickhelper/helpsphinx/index.html>`_
       - Fonctions, outils implémentées en C, C++ et habillées en Python. C'est aussi
         un template pour ceux qui souhaite réaliser un module en C/C++/Cython.
@@ -762,7 +788,7 @@ Contenu
         mathématiques que dans les autres modules.
     * - `papierstat <http://www.xavierdupre.fr/app/papierstat/helpsphinx/index.html>`_
       - Découverte du :epkg:`machine learning`, mélange de pratique et de théorie.
-    * - `sparkouille <http://www.xavierdupre.fr/app/sparkouille/helpsphinx/index.html>`_
+    * - :epkg:`sparkouille`
       - Bafouille sur :epkg:`spark`.
     * - `teachpyx <http://www.xavierdupre.fr/app/teachpyx/helpsphinx/index.html>`_
       - Cours de programmation en Python. C'est la version internet et actualisée

diff --git a/_doc/sphinxdoc/source/conf_base.py b/_doc/sphinxdoc/source/conf_base.py
@@ -85,6 +85,7 @@
 epkg_dictionary["basemap"] = 'https://matplotlib.org/basemap/'
 epkg_dictionary["blockchain"] = 'https://fr.wikipedia.org/wiki/Blockchain'
 epkg_dictionary["csharpy"] = 'http://www.xavierdupre.fr/app/csharpy/helpsphinx/index.html'
+epkg_dictionary["csharpyml"] = 'http://www.xavierdupre.fr/app/csharpyml/helpsphinx/index.html'
 epkg_dictionary["C++"] = 'https://fr.wikipedia.org/wiki/C%2B%2B'
 epkg_dictionary["catboost"] = "https://github.com/catboost/catboost"
 epkg_dictionary["CNTK"] = 'https://www.microsoft.com/en-us/research/product/cognitive-toolkit/'
@@ -106,12 +107,13 @@
 epkg_dictionary["lightmlrestapi"] = 'http://www.xavierdupre.fr/app/lightmlrestapi/helpsphinx/index.html'
 epkg_dictionary["Linux"] = 'https://fr.wikipedia.org/wiki/Linux'
 epkg_dictionary["linux"] = 'https://fr.wikipedia.org/wiki/Linux'
-epkg_dictionary["mlinsights"] = 'http://www.xavierdupre.fr/app/mlinsights/helpsphinx/index.html'
-epkg_dictionary["mlprodict"] = 'http://www.xavierdupre.fr/app/mlprodict/helpsphinx/index.html'
 epkg_dictionary["machine learning"] = 'https://fr.wikipedia.org/wiki/Apprentissage_automatique'
 epkg_dictionary["manydataapi"] = 'http://www.xavierdupre.fr/app/manydataapi/helpsphinx/index.html'
 epkg_dictionary["matrice de confusion"] = "https://fr.wikipedia.org/wiki/Matrice_de_confusion"
 epkg_dictionary["miniconda"] = 'https://conda.io/miniconda.html'
+epkg_dictionary["mlinsights"] = 'http://www.xavierdupre.fr/app/mlinsights/helpsphinx/index.html'
+epkg_dictionary["mlprodict"] = 'http://www.xavierdupre.fr/app/mlprodict/helpsphinx/index.html'
+epkg_dictionary['ML.net' = 'https://github.com/dotnet/machinelearning'
 epkg_dictionary["MPI"] = 'https://en.wikipedia.org/wiki/Message_Passing_Interface'
 epkg_dictionary["notebook"] = 'http://jupyter.org/'
 epkg_dictionary["Notepad++"] = "https://notepad-plus-plus.org/"

diff --git a/_unittests/ut_automation/test_jenkins.py b/_unittests/ut_automation/test_jenkins.py
@@ -64,7 +64,7 @@ def test_jenkins_local27(self):
             OutputPrint=__name__ == "__main__")
 
         modules = default_jenkins_jobs(".*yml.*", ".*update.*")
-        self.assertEqual(len(modules), 27)
+        self.assertEqual(len(modules), 29)
         modules = default_jenkins_jobs(".*27.*", ".*update.*")
         self.assertEqual(len(modules), 0)
         modules = default_jenkins_jobs(".*27.*")

diff --git a/_unittests/ut_documentation/test_rst2html_deps.py b/_unittests/ut_documentation/test_rst2html_deps.py
@@ -67,7 +67,9 @@ def test_rst2html_deps(self):
                      pymyinstall="http", Jenkins="http", docutils="http",
                      Jupyter="http", lightmlboard="zoo", lightmlrestapi="mll",
                      mlinsights="mli", mlprodict="mlp", sparkouille="spko",
-                     spark='spk', manydataapi="mda")
+                     spark='spk', manydataapi="mda", csharpy='cspy',
+                     csharpyml='cspyml', Python='Python')
+        links.update({'ML.net':'mlnet', 'C#': 'C#'})
 
         for full in fulls:
             last = os.path.split(full)[-1]

diff --git a/_unittests/ut_module/test_code_style.py b/_unittests/ut_module/test_code_style.py
@@ -147,6 +147,7 @@ def test_style_test(self):
                          "Unable to import 'pyopencl'",
                          "Unused import clr",
                          "Unused variable 'clr'",
+                         "Unable to import 'clr'",
                          "Module 'clr' has no 'AddReference' member",
                          ])
 

diff --git a/src/ensae_teaching_cs/automation/teaching_modules.py b/src/ensae_teaching_cs/automation/teaching_modules.py
@@ -20,4 +20,4 @@ def get_teaching_modules():
             "ensae_teaching_cs", "code_beatrix", "actuariat_python", "mlstatpy", "jupytalk",
             "teachpyx", "tkinterquickhelper", "cpyquickhelper", "pandas_streaming",
             "lightmlboard", "lightmlrestapi", "mlinsights", "pyenbc", "mlprodict",
-            "papierstat", "sparkouille", "manydataapi", "csharpy"]
+            "papierstat", "sparkouille", "manydataapi", "csharpy", "csharpyml"]