Merge branch 'master' into model_wrapper_class

Author: javdrher

GPflowOpt/__init__.py

@@ -22,3 +22,5 @@
 from . import objective
 from . import pareto
 from . import models
+
+from ._version import __version__

doc/source/conf.py

@@ -18,6 +18,7 @@
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #
 import os
+from GPflowOpt import __version__
 
 # on_rtd is whether we are on readthedocs.org, this line of code grabbed from docs.readthedocs.org
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
@@ -78,9 +79,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'pre-release'
+version = __version__
 # The full version, including alpha/beta/rc tags.
-release = 'pre-release'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.