Merge remote-tracking branch 'origin/development' into development

Author: gjbex

docs/README.md

@@ -65,6 +65,18 @@ from scratch.
 If you plan to do Python programming in a Linux or HPC environment you should
 be familiar with these as well.
 
+For following along hands-on, you need
+* laptop or desktop with internet access.
+* a Python environment that can run Jupyter Lab if you want to use your own system;
+* access to Google Colaboratory if you prefer not to install software.
+
+
+## Level
+
+* Introductory: 30 %
+* Intermediate: 40 %
+* Advanced: 30 %
+
 
 ## Trainer(s)
 

docs/_config.yml

@@ -1 +1,2 @@
-theme: jekyll-theme-slate
+title: "Python software development"
+theme: jekyll-theme-slate

source-code/design-patterns/README.md

@@ -8,9 +8,11 @@ Code to illustrate some design patterns in Python.
    can be used to change the behaviour of objects.
 1. `factory_design_pattern.ipynb`: notebook illustrating how a factory class
    can be used to conveniently construct many objects with the same properties.
-1. `finite-state-parser`: illustration of object-oriented data
-    representation and the state pattern.
 1. `iterator_design_pattern.ipynb`: illustration of the iterator design pattern
    (as well as the factory pattern).
 1. `strategy_design_pattern.ipynb`: notebook illustrating how a strategy
    design pattern can simplify simulations. 
+1. `state_machine_design_pattern.ipynb`: notebook illustrating how a state
+   machine can be implemented in Python.
+1. `finite-state-parser`: illustration of object-oriented data
+    representation and the state pattern.