Merge branch 'master' into release

.travis.yml

@@ -1,13 +1,10 @@
 language: python
 
 python:
-    - "2.7"
-    - "3.4"
     - "3.5"
     - "3.6"
     - "3.7"
     - "3.8"
-
-install: yes
+    - "3.9"
 
 script: test/runtests.sh

CHANGELOG.rst

@@ -3,6 +3,30 @@ Change Log
 ==========
 
 
+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.
+
+
+Fixed
+-----
+
+
 3.0
 ===
 
@@ -13,7 +37,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 +128,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 +159,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.
 

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2016-2020 Bálint Aradi, Universität Bremen
+Copyright (c) 2016-2021 Bálint Aradi, Universität Bremen
 
 All rights reserved.