Skip to content

Commit

Permalink
Merge pull request #228 from vasole/warnings
Browse files Browse the repository at this point in the history
Get rid of minor sphinx warnings
  • Loading branch information
vasole authored Apr 26, 2018
2 parents 31f2015 + 2703acc commit b2e5707
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
9 changes: 3 additions & 6 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -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
-------------
Expand Down
10 changes: 5 additions & 5 deletions doc/source/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://sourceforge.net/projects/pymca/files/pymca/>`_. 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 <https://sourceforge.net/projects/pymca/files/pymca/>`_. 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 <http://www.numpy.org/>`_ and `fisx <https://github.com/vasole/fisx>`_ are the only mandatory dependencies for command line usage,
graphical widgets require Qt and `matplotlib <http://matplotlib.org/>`_ and management of HDF5 data files requires
Expand Down Expand Up @@ -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\``.
Expand All @@ -137,7 +137,7 @@ All dependencies may be simply installed with pip:
Installing *PyMca*
+++++++++++++++++
++++++++++++++++++

Provided numpy is installed, you can install *PyMca* with:

Expand Down

0 comments on commit b2e5707

Please sign in to comment.