Minor documentation update (+ fixed requirements)

Author: PierreRaybaut

build_dist.bat

@@ -1,7 +1,6 @@
 del MANIFEST
 rmdir /S /Q build
 rmdir /S /Q dist
-python setup.py build bdist_wininst --plat-name=win32
-python setup.py build bdist_wininst --plat-name=win-amd64
+set PYTHONPATH=%cd%
 python setup.py sdist bdist_wheel --universal
 python setup.py build sdist

build_doc.bat

@@ -1,6 +1,8 @@
+@echo off
+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
-"C:\Program Files\HTML Help Workshop\hhc.exe" doctmp\PythonQwt.hhp
-"C:\Program Files (x86)\HTML Help Workshop\hhc.exe" doctmp\PythonQwt.hhp
+hhc doctmp\PythonQwt.hhp
 copy doctmp\PythonQwt.chm .
 7z a PythonQwt.chm.zip PythonQwt.chm
 del doctmp\PythonQwt.chm

doc/conf.py

@@ -116,7 +116,7 @@
 html_title = '%s %s Manual' % (project, version)
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-html_short_title = '%s Manual' % project
+#html_short_title = '%s Manual' % project
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.

doc/installation.rst

@@ -7,8 +7,9 @@ Dependencies
 Requirements:
     * Python 2.x (x>=6) or 3.x (x>=2)
     * PyQt4 4.x (x>=3 ; recommended x>=4) or PyQt5 5.x (x>=5)
-    * spyderlib >=v2.0.10 for the test launcher
     * NumPy 1.x (x>=5)
+    * guidata >=v1.7 for the test launcher
+    * Sphinx 1.x (x>=1) for documentation generation
 
 Installation
 ------------

qwt/py3compat.py

@@ -5,8 +5,8 @@
 # (see LICENSE file for details)
 
 """
-guidata.py3compat (exact copy of spyderlib.py3compat)
------------------------------------------------------
+qwt.py3compat (exact copy of spyderlib.py3compat)
+-------------------------------------------------
 
 Transitional module providing compatibility functions intended to help 
 migrating from Python 2 to Python 3.

qwt/qt/compat.py

@@ -5,8 +5,8 @@
 # (see LICENSE file for details)
 
 """
-spyderlib.qt.compat
--------------------
+qwt.qt.compat (exact copy of spyderlib.qt.compat)
+-------------------------------------------------
 
 Transitional module providing compatibility functions intended to help 
 migrating from PyQt to PySide.
@@ -112,7 +112,7 @@ def _qfiledialog_wrapper(attr, parent=None, caption='', basedir='',
         options = QFileDialog.Options(0)
     try:
         # PyQt <v4.6 (API #1)
-        from spyderlib.qt.QtCore import QString
+        from qwt.qt.QtCore import QString
     except ImportError:
         # PySide or PyQt >=v4.6
         QString = None  # analysis:ignore
@@ -200,8 +200,8 @@ def getsavefilename(parent=None, caption='', basedir='', filters='',
                                 options=options)
 
 if __name__ == '__main__':
-    from spyderlib.utils.qthelpers import qapplication
-    _app = qapplication()
+    from qwt.qt.QtGui import QApplication
+    _app = QApplication([])
     print(repr(getexistingdirectory()))
     print(repr(getopenfilename(filters='*.py;;*.txt')))
     print(repr(getopenfilenames(filters='*.py;;*.txt')))

setup.py

@@ -127,7 +127,7 @@ 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.3"],
+      install_requires=["NumPy>=1.5"],
       extras_require = {
                         'Doc':  ["Sphinx>=1.1"],
                         'Tests':  ["guidata>=1.7.0"],