diff --git a/changelog.txt b/changelog.txt index 6e5aeb6ff..c5d3584e4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,16 +1,13 @@ VERSION 5.3.1 ------------- -- PyMcaMainWindow. Correct error trying to use HDF5 files with only top level -datasets. +- PyMcaMainWindow. Correct error trying to use HDF5 files with only top level datasets. - PyMcaBatch. Correct error when opening HDF5 files as input. -- Use QOpenGLWidget when available instead of QGLWidget. It solves a Debian -packaging issue. +- Use QOpenGLWidget when available instead of QGLWidget. It solves a Debian packaging issue. -- Prepare web pages using sphinx to be ready for easy deployment of improved -documentation (accessible from http://www.silx.org) +- Prepare web pages using sphinx to be ready for easy deployment of improved documentation (accessible from http://www.silx.org) VERSION 5.3.0 ------------- diff --git a/doc/source/install.rst b/doc/source/install.rst index 7df7b702c..5e6db01aa 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -2,19 +2,19 @@ Installation steps ================== -*PyMca* supports most operating systems, different version of the Python +*PyMca* supports most operating systems and different version of the Python programming language. Stand-alone Executable ---------------------- -Stand-alone applications (aka. frozen binaries) are supplied for Windows and MacOS. They and do not require any additional dependency and can be downloaded from `here `_. Just download the installer for your platform. +Stand-alone applications (aka. frozen binaries) are supplied for Windows and MacOS. They do not require any additional dependency and can be downloaded from `here `_. Just download the installer for your platform. Python module ------------- -The best use of PyMca can be achieved installing PyMca as a python package inside an Python installation. For Windows and MacOS there are pre-compiled modules available in order to simplify the tast. +The best use of PyMca can be achieved installing PyMca as a python package inside an existing Python installation. For Windows and MacOS there are pre-compiled modules available in order to simplify the tast. You can also install PyMca from its source code. While `numpy `_ and `fisx `_ are the only mandatory dependencies for command line usage, graphical widgets require Qt and `matplotlib `_ and management of HDF5 data files requires @@ -117,7 +117,7 @@ Please follow the instructions suplied by the silx project http://www.silx.org/d Using pip +++++++++ -Configure your PATH environment variable to include the pip installation +Configure your PATH environment variable to include the pip installation directory, the same way as described for Python. The pip installation directory will likely be ``C:\Python35\Scripts\``. @@ -137,7 +137,7 @@ All dependencies may be simply installed with pip: Installing *PyMca* -+++++++++++++++++ +++++++++++++++++++ Provided numpy is installed, you can install *PyMca* with: