diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e27bff36738b3e8750437885fb49a2af12abe6fe..63302ceedba7fac56d09169f04a99a6185972b2b 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 d711e110d35de0cbc2fa089ca9806319a9dcdc85..d753da3bacd2f6c2cc7be43c0a140dda97dc0686 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 5dee416cdfa12ee400e45ebe788a5da444f4c3b1..251f98c2d5a4db188f9bb8e4c8dd424512f60840 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