Merge pull request #79 from vanderhe/fypp-3.2

Upgrade to fypp v3.2

external/fypp/CHANGELOG.rst

@@ -3,6 +3,36 @@ Change Log
 ==========
 
 
+3.2
+===
+
+Added
+-----
+
+* Option ``--file-var-root`` to render file variables (``_FILE_``,
+  ``_THIS_FILE``) as relative paths with respect to a specified root.
+
+
+3.1
+===
+
+Added
+-----
+
+* Global variables _SYSTEM_ and _MACHINE_ to query environment.
+
+* Emission of standard (#line pragma styled) line directives.
+
+* Factory method arguments in Fypp constructor: evaluator_factory,
+  parser_factor, builder_factory and renderer_factory.
+
+
+Changed
+-------
+
+* Support for Python 2.7, 3.3 and 3.4 dropped, support for Python 3.9 added.
+
+
 3.0
 ===
 
@@ -13,7 +43,7 @@ Added
 
 * Add block / contains / endblock construct as alternative for call / nextarg /
   endcall.
-  
+
 * Escaping of preprocessor comments
 
 * Possibility of specifying character encoding for file I/O with UTF-8 as
@@ -104,7 +134,7 @@ Added
 * Python-like consistent global and local scopes and scope lookup rules.
 
 * Predefined variables _THIS_FILE_ and _THIS_LINE_.
-    
+
 * Additional flags in line numbering directives when opening a file or returning
   to a previous file.
 
@@ -135,7 +165,7 @@ Changed
 
 * Function setvar() accepts arbitrary number of argument pairs.
 
-* Reverse order exception printing, exception first occuring printed as last.
+* Reverse order exception printing, exception first occurring printed as last.
 
 * Command line tool formats error messages in GNU-like format.
 

external/fypp/README.rst

@@ -170,21 +170,52 @@ Main features
 Installing
 ==========
 
-Fypp needs a working Python interpreter. It is compatible with Python 2 (version
-2.6 and above) and Python 3 (all versions).
+Fypp needs a working Python 3 interpreter (Python 3.5 or above).
 
-Automatic install
------------------
+When you install Fypp, you obtain the command line tool ``fypp`` and the Python
+module ``fypp.py``. Latter you can import if you want to access the
+functionality of Fypp directly from within your Python scripts.
 
-Use Pythons command line installer ``pip`` in order to download the stable
-release from the `Fypp page on PyPI <http://pypi.python.org/pypi/fypp>`_ and
-install it on your system::
 
-  pip install fypp
+Installing via conda
+--------------------
 
-This installs both, the command line tool ``fypp`` and the Python module
-``fypp.py``. Latter you can import if you want to access the functionality of
-Fypp directly from within your Python scripts.
+The last stable release of Fypp can be easily installed as conda package by
+issuing ::
+
+  conda install -c conda-forge fypp
+
+
+Installing via pip
+------------------
+
+You can also use Pythons command line installer ``pip`` in order to download the
+stable release from the `Fypp page on PyPI <http://pypi.python.org/pypi/fypp>`_
+and install it on your system.
+
+If you want to install Fypp into the module system of the active Python 3
+interpreter (typically the case when you are using a Python virtual
+environment), issue ::
+
+  pip3 install fypp
+
+Alternatively, you can install Fypp into the user space (under `~/.local`) with
+::
+
+  pip3 install --user fypp
+
+
+Installing via MSYS2 pacman
+---------------------------
+
+On Windows you can use the `MSYS2 toolchain <https://www.msys2.org/>`_ to install
+Fypp in a MinGW terminal. To install Fypp use::
+
+  pacman -S mingw-w64-x86_64-python-fypp
+
+Make sure the selected architecture is matching your current MinGW terminal.
+For all supporting MinGW architectures visit check the package index
+`here <https://packages.msys2.org/base/mingw-w64-python-fypp>`_.
 
 
 Manual install