fix help generation

src/pymyinstall/__init__.py

@@ -55,4 +55,5 @@ def check(log=False):
 from .packaged.packaged_config import complete_installation, small_installation, installation_huge_datasets, installation_teachings
 from .packaged.packaged_config import installation_azure, extend_winpython, extend_anaconda, extension_ensae, installation_ensae
 from .installhelper.install_custom_revealjs import download_revealjs
-from .win_installer.win_setup import win_python_setup
+# adding this line breaks the documentation generation
+from .win_installer.win_setup_main import win_python_setup

src/pymyinstall/installhelper/__init__.py

@@ -13,3 +13,4 @@
 from .install_custom_7z import install_7z
 from .install_cmd_helper import run_cmd, update_pip
 from .install_custom import download_page
+from .module_install import ModuleInstall

src/pymyinstall/packaged/packaged_functions.py

@@ -9,8 +9,8 @@
 from .packaged_config import installation_ensae, installation_teachings
 from ..installhelper.install_custom_scite import install_scite, add_shortcut_to_desktop_for_scite
 from ..installhelper.install_custom_pandoc import install_pandoc
-from ..setuphelper.ipython_helper import setup_ipython, add_shortcut_to_desktop_for_ipython
 from ..installhelper.install_custom_sqlitespy import install_sqlitespy, add_shortcut_to_desktop_for_sqlitespy
+from ..setuphelper.ipython_helper import setup_ipython, add_shortcut_to_desktop_for_ipython
 
 
 def datascientist(folder="install",

src/pymyinstall/win_installer/__init__.py

@@ -4,5 +4,5 @@
 
 from .win_exception import WinInstallException
 from .win_extract import extract_msi, extract_exe
-from .win_setup import win_python_setup
 from .win_setup_r import r_run_script
+from .win_setup_main import win_python_setup

src/pymyinstall/win_installer/win_extract.py

@@ -11,7 +11,7 @@
 import tarfile
 import zipfile
 import fnmatch
-#import winreg
+# import winreg
 import glob
 
 from .win_helper import patch_shebang_line

src/pymyinstall/win_installer/win_innosetup.py → src/pymyinstall/win_installer/win_innosetup_helper.py

@@ -5,7 +5,7 @@
 from __future__ import print_function
 
 import os
-from ..installhelper import run_cmd
+from ..installhelper.install_cmd_helper import run_cmd
 
 
 class InnoSetupException(Exception):

src/pymyinstall/win_installer/win_packages.py

@@ -6,8 +6,8 @@
 
 import os
 import sys
-from ..installhelper.install_cmd_helper import run_cmd
 from .win_exception import WinInstallPackageException
+from ..installhelper.install_cmd_helper import run_cmd
 from ..packaged.packaged_config import installation_ensae, installation_teachings
 
 

src/pymyinstall/win_installer/win_setup_julia.py

@@ -3,7 +3,7 @@
 @brief Functions to prepare a setup on Windows, R functions
 """
 import os
-from ..installhelper import run_cmd
+from ..installhelper.install_cmd_helper import run_cmd
 
 _script = os.path.join(
     os.path.abspath(os.path.dirname(__file__)), "Julia_install.jl")

src/pymyinstall/win_installer/win_setup.py → src/pymyinstall/win_installer/win_setup_main.py

@@ -10,20 +10,25 @@
 import shutil
 import datetime
 
-from ..installhelper import install_pandoc, install_sqlitespy, install_R, install_scite, install_julia, install_python, install_mingw, install_7z
+from ..installhelper.install_custom_pandoc import install_pandoc
+from ..installhelper.install_custom_R import install_R
+from ..installhelper.install_custom_julia import install_julia
+from ..installhelper.install_custom_scite import install_scite
+from ..installhelper.install_custom_sqlitespy import install_sqlitespy
+from ..installhelper.install_custom_python import install_python
+from ..installhelper.install_custom_mingw import install_mingw
+from ..installhelper.install_custom_7z import install_7z
+from ..installhelper.install_custom import download_page
 from ..installhelper.install_custom_scite import modify_scite_properties
 from ..packaged.packaged_config import small_installation
+from .import_pywin32 import import_pywin32
 from .win_extract import extract_msi, extract_exe, extract_archive, clean_msi
 from .win_packages import _is_package_in_list, win_install_packages_other_python
-#from .win_helper import create_shortcut
-from ..installhelper.link_shortcuts import add_shortcut
-from ..installhelper.install_cmd_helper import update_pip
-from .import_pywin32 import import_pywin32
+from .win_batch import create_win_batches
 from .win_setup_r import r_run_script, _script as _script_r
 from .win_setup_julia import julia_run_script, _script as _script_julia
-from .win_innosetup import run_innosetup
-from ..installhelper import download_page
-from .win_batch import create_win_batches
+
+from .win_innosetup_helper import run_innosetup
 
 license = """
 Copyright (c) 2013-2015, Xavier Dupré

src/pymyinstall/win_installer/win_setup_r.py

@@ -3,7 +3,7 @@
 @brief Functions to prepare a setup on Windows, R functions
 """
 import os
-from ..installhelper import run_cmd
+from ..installhelper.install_cmd_helper import run_cmd
 
 _script = os.path.join(
     os.path.abspath(os.path.dirname(__file__)), "R_install.r")