Merge branch 'master' into fix-scipy-import

config.default.yaml

@@ -238,8 +238,8 @@ solving:
   #   threads: 4
   #   lpmethod: 4 # barrier
   #   solutiontype: 2 # non basic solution, ie no crossover
-  #   barrier_convergetol: 1.e-5
+  #   barrier.convergetol: 1.e-5
-  #   feasopt_tolerance: 1.e-6
+  #   feasopt.tolerance: 1.e-6
 
 plotting:
   map:

doc/conf.py

@@ -157,16 +157,12 @@ html_theme_options = {
 # pixels large.
 #html_favicon = None
 
-# Add any paths that contain custom static files (such as style sheets) here,
+# These folders are copied to the documentation's HTML output
-# relative to this directory. They are copied after the builtin static files,
+html_static_path = ["_static"]
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
 
-html_context = {
+# These paths are either relative to html_static_path
-    'css_files': [
+# or fully qualified paths (eg. https://...)
-        '_static/theme_overrides.css',  # override wide tables in RTD theme
+html_css_files = ["theme_overrides.css"]
-        ],
-}
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied

doc/configtables/solving-solver.csv

@@ -1,3 +1,3 @@
 ,Unit,Values,Description
 name,--,"One of {'gurobi', 'cplex', 'cbc', 'glpk', 'ipopt'}; potentially more possible","Solver to use for optimisation problems in the workflow; e.g. clustering and linear optimal power flow."
-opts,--,"Parameter list for `Gurobi <https://www.gurobi.com/documentation/8.1/refman/parameters.html>`_ and `CPLEX <https://www.ibm.com/support/knowledgecenter/SSSA5P_12.5.1/ilog.odms.cplex.help/CPLEX/Parameters/topics/introListAlpha.html>`_","Solver specific parameter settings."
+opts,--,"Parameter list for `Gurobi <https://www.gurobi.com/documentation/8.1/refman/parameters.html>`_ and `CPLEX <https://www.ibm.com/docs/en/icos/20.1.0?topic=cplex-topical-list-parameters>`_","Solver specific parameter settings."

test/config.test1.yaml

@@ -195,8 +195,8 @@ solving:
   #   threads: 4
   #   lpmethod: 4 # barrier
   #   solutiontype: 2 # non basic solution, ie no crossover
-  #   barrier_convergetol: 1.e-5
+  #   barrier.convergetol: 1.e-5
-  #   feasopt_tolerance: 1.e-6
+  #   feasopt.tolerance: 1.e-6
 
 plotting:
   map: