Removed CHM from distributed wheel package, added zipped CHM to source package (link in documentation)

Author: PierreRaybaut

MANIFEST.in

@@ -2,4 +2,5 @@ recursive-include doc *.py *.rst *.png
 include MANIFEST.in
 include LICENSE
 include README.md
-include CHANGELOG.md
+include CHANGELOG.md
+include doc/PythonQwt.chm.zip

build_doc.bat

@@ -1,15 +1,25 @@
 @echo off
+if defined WINPYDIRBASE (
+    call %WINPYDIRBASE%\scripts\env.bat
+    @echo ==============================================================================
+    @echo:
+    @echo Using WinPython from %WINPYDIRBASE%
+    @echo:
+    @echo ==============================================================================
+    @echo:
+    )
 set PATH=C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip;C:\Program Files\HTML Help Workshop;C:\Program Files (x86)\HTML Help Workshop;%PATH%
 set PYTHONPATH=%cd%
-sphinx-build -b htmlhelp doc doctmp
-hhc doctmp\PythonQwt.hhp
-copy doctmp\PythonQwt.chm .
-7z a PythonQwt.chm.zip PythonQwt.chm
-del doctmp\PythonQwt.chm
-del doc.zip
-sphinx-build -b html doc doctmp
-cd doctmp
-7z a -r ..\doc.zip *.*
-cd ..
-rmdir /S /Q doctmp
-del PythonQwt.chm.zip
+sphinx-build -b htmlhelp doc build\doc
+hhc build\doc\PythonQwt.hhp
+copy build\doc\PythonQwt.chm doc
+7z a doc\PythonQwt.chm.zip doc\PythonQwt.chm
+move doc\PythonQwt.chm .
+sphinx-build -b html doc build\doc
+@echo:
+@echo ==============================================================================
+@echo:
+if not defined UNATTENDED (
+    @echo End of script
+    pause
+    )

doc/conf.py

@@ -103,7 +103,7 @@
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = "classic"
+html_theme = "default"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

doc/index.rst

@@ -4,7 +4,7 @@
 
 	.. note::
 
-		Windows users may download the :download:`CHM Manual <../PythonQwt.chm.zip>`.
+		Windows users may download the :download:`CHM Manual <PythonQwt.chm.zip>`.
 
 		After downloading this file, you may see blank pages in the documentation. 
 		That's because Windows is blocking CHM files for security reasons. 

setup.py

@@ -16,9 +16,6 @@
 import os
 import sys
 import os.path as osp
-import subprocess
-import shutil
-import atexit
 
 import setuptools  # analysis:ignore
 from distutils.core import setup
@@ -89,45 +86,6 @@ def get_subpackages(name):
     return splist
 
 
-def build_chm_doc(libname):
-    """Return CHM documentation file (on Windows only), which is copied under 
-    {PythonInstallDir}\Doc, hence allowing Spyder to add an entry for opening 
-    package documentation in "Help" menu. This has no effect on a source 
-    distribution."""
-    args = "".join(sys.argv)
-    if os.name == "nt" and ("bdist" in args or "build" in args):
-        try:
-            import sphinx  # analysis:ignore
-        except ImportError:
-            print(
-                "Warning: `sphinx` is required to build documentation", file=sys.stderr
-            )
-            return
-        hhc_base = r"C:\Program Files%s\HTML Help Workshop\hhc.exe"
-        for hhc_exe in (hhc_base % "", hhc_base % " (x86)"):
-            if osp.isfile(hhc_exe):
-                break
-        else:
-            print(
-                "Warning: `HTML Help Workshop` is required to build CHM "
-                "documentation file",
-                file=sys.stderr,
-            )
-            return
-        doctmp_dir = "doctmp"
-        subprocess.call("sphinx-build -b htmlhelp doc %s" % doctmp_dir, shell=True)
-        atexit.register(shutil.rmtree, osp.abspath(doctmp_dir))
-        fname = osp.abspath(osp.join(doctmp_dir, "%s.chm" % libname))
-        subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
-        if osp.isfile(fname):
-            return fname
-        else:
-            print("Warning: CHM building process failed", file=sys.stderr)
-
-
-CHM_DOC = build_chm_doc(LIBNAME)
-
-
 setup(
     name=LIBNAME,
     version=version,
@@ -137,7 +95,6 @@ def build_chm_doc(libname):
     package_data={
         PACKAGE_NAME: get_package_data(PACKAGE_NAME, (".png", ".svg", ".mo"))
     },
-    data_files=[(r"Doc", [CHM_DOC])] if CHM_DOC else [],
     install_requires=["NumPy>=1.5"],
     extras_require={"Doc": ["Sphinx>=1.1"],},
     entry_points={