From 14b4211da54219f167238e5f51a3179a9a0b33c2 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Fri, 11 May 2018 16:29:58 +0100
Subject: [PATCH] Doc updates
---
CHANGELOG.rst | 12 ++++++++++++
README.rst | 8 +++-----
doc/contributing.rst | 1 +
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e27bff367..63302ceed 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,18 @@ This document contains the ``fslpy`` release history in reverse chronological
order.
+1.8.1 (Friday May 11th 2018)
+----------------------------
+
+
+Changed
+^^^^^^^
+
+
+* The :func:`.fileOrImage` decorator function now accepts :class:`.Image`
+ objects as well as ``nibabel`` image objects.
+
+
1.8.0 (Thursday May 3rd 2018)
-----------------------------
diff --git a/README.rst b/README.rst
index d711e110d..d753da3ba 100644
--- a/README.rst
+++ b/README.rst
@@ -48,12 +48,10 @@ Some extra dependencies are listed in `requirements.txt
on the mesh.
+If you are using Linux, need to install wxPython first, as binaries are not
+available on PyPI. Change the URL for your specific platform::
-To install these additional dependencies, you first need to install wxPython,
-which is still in pre-relaes.
-
- - **macOS**: ``pip install --pre wxPython``
- - **Linux** (change the URL for your specific platform): ``pip install --only-binary wxpython -f https://extras.wxpython.org/wxPython4/extras/linux/gtk2/ubuntu-16.04/ wxpython``
+ pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk2/ubuntu-16.04/ wxpython
The ``rtree`` library also assumes that ``libspatialindex`` is installed on
diff --git a/doc/contributing.rst b/doc/contributing.rst
index 5dee416cd..251f98c2d 100644
--- a/doc/contributing.rst
+++ b/doc/contributing.rst
@@ -42,6 +42,7 @@ the following labels (this convention has been inherited from `nibabel
* *DOC*: for all kinds of documentation related commits
* *TEST*: for adding or changing tests
* *MAINT*: for administrative/maintenance changes
+ * *CI*: for continuous-integration changes
Version number
--
GitLab