diff --git a/apidoc/conf.py b/apidoc/conf.py index 6a29f73e2be4c18b46f83a15dfbd84d9448312ae..ff39e3029272a455f440c137aba81b4ac60c7857 100644 --- a/apidoc/conf.py +++ b/apidoc/conf.py @@ -63,10 +63,11 @@ copyright = u'{}, Paul McCarthy, FMRIB Centre'.format(date.year) # built documents. # # The short X.Y version. -import fsl -version = fsl.__version__ +import fsl.version as fslversion +version = fslversion.__version__ + # The full version, including alpha/beta/rc tags. -release = version +release = '{} ({})'.format(version, fslversion.__vcs_version__) # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -277,7 +278,7 @@ texinfo_documents = [ epub_title = u'FSLpy' epub_author = u'Paul McCarthy' epub_publisher = u'Paul McCarthy' -epub_copyright = u'{}, Paul McCarthy'.format(date.year) +epub_copyright = u'{}, Paul McCarthy, FMRIB Centre, Oxford'.format(date.year) # The basename for the epub file. It defaults to the project name. #epub_basename = u'FSLpy' diff --git a/fsl/fsleyes/gl/wxglslicecanvas.py b/fsl/fsleyes/gl/wxglslicecanvas.py index 4964630fab60f25fe2a50d3b8d63fab4d762e0c1..d56f5dd0eccc05283b1b56a60444800a317ab86a 100644 --- a/fsl/fsleyes/gl/wxglslicecanvas.py +++ b/fsl/fsleyes/gl/wxglslicecanvas.py @@ -51,7 +51,7 @@ class WXGLSliceCanvas(slicecanvas.SliceCanvas, displayed on the canvas seems to persist, does not get overridden, and gets drawn on top of other things in the interface: - .. image:: images/x11_slicecanvas_bug.png + .. image:: images/x11_slicecanvas_show_bug.png :scale: 50% :align: center diff --git a/fsl/utils/dialog.py b/fsl/utils/dialog.py index 92ff78d09800dd9c4cd404a2e2bb6130dc5c7e53..f922d06d13e3bc08c04e28df179f14f8cd4a72c2 100644 --- a/fsl/utils/dialog.py +++ b/fsl/utils/dialog.py @@ -710,7 +710,7 @@ class FSLDirDialog(wx.Dialog): class CheckBoxMessageDialog(wx.Dialog): """A ``wx.Dialog`` which displays a message, a ``wx.CheckBox``, and - an "Ok" button. + an *Ok* button. """ @@ -735,13 +735,13 @@ class CheckBoxMessageDialog(wx.Dialog): :arg cbState: Initial state for the ``wx.CheckBox``. - :arg btnText: Text to show on the button. Defaults to "OK". + :arg btnText: Text to show on the button. Defaults to *OK*. :arg icon: A ``wx`` icon identifier (e.g. ``wx.ICON_EXCLAMATION``). :arg style: Passed through to the ``wx.Dialog.__init__`` method. - Defaults to ``wx.DEFAULT_DIALOG_STYLE`. + Defaults to ``wx.DEFAULT_DIALOG_STYLE``. """ if style is None: style = wx.DEFAULT_DIALOG_STYLE diff --git a/fsl/utils/memoize.py b/fsl/utils/memoize.py index bc4de759663eb16fcb5f7928d57579ae402b3e64..07f6f1242643c7c25288e789639e4bf0de8d712b 100644 --- a/fsl/utils/memoize.py +++ b/fsl/utils/memoize.py @@ -104,7 +104,6 @@ class Instanceify(object): can be applied to instance methods. For example, say we have the following class:: - class Container(object): def __init__(self): @@ -121,7 +120,7 @@ class Instanceify(object): be associated with a single ``Container`` instance. - By redefining the ``Container`` class definition like so: + By redefining the ``Container`` class definition like so:: class Container(object): diff --git a/fsl/version.py b/fsl/version.py index 3448375585d9bd7fbfd7c9e4bca001ae15ed6522..78d9ac1425f75fb6169845181152303c96cf8708 100644 --- a/fsl/version.py +++ b/fsl/version.py @@ -15,9 +15,9 @@ version number and information. .. todo:: Define a formal ``fslpy`` version number updating scheme. """ -__version__ = '0.1' +__version__ = '0.9a' """Current version number, as a string. """ -__vcs_version__ = 'abc' +__vcs_version__ = '0.9a' """VCS (Version Control System) version number, for internal use. """