From 4a7dc5710cae6bc056bb55ddacc220e4c4b1f80c Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Fri, 5 Oct 2018 17:49:13 +0100
Subject: [PATCH] DOC: Changelog and readme - dropping python 2/3.4
---
CHANGELOG.rst | 11 +++++++++++
README.rst | 15 +++++++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1eee76621..34a8fc68c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@ This document contains the ``fslpy`` release history in reverse chronological
order.
+2.0.0 (Under development)
+-------------------------
+
+
+Changed
+^^^^^^^
+
+* Removed support for Python 2.7 and 3.4.
+
+
1.12.0 (Sunday October 21st 2018)
---------------------------------
@@ -22,6 +32,7 @@ Deprecated
* The ``extract_noise`` script.
+
1.11.1 (Friday September 14th 2018
----------------------------------
diff --git a/README.rst b/README.rst
index eadd675aa..bdd032b0c 100644
--- a/README.rst
+++ b/README.rst
@@ -20,6 +20,9 @@ programming library written in Python. It is used by `FSLeyes
<https://git.fmrib.ox.ac.uk/fsl/fsleyes/fsleyes/>`_.
+``fslpy`` is tested against Python versions 3.5, 3.6 and 3.7.
+
+
Installation
------------
@@ -56,8 +59,8 @@ 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::
+If you are using Linux, you need to install wxPython first, as binaries are
+not available on PyPI. Change the URL for your specific platform::
pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk2/ubuntu-16.04/ wxpython
@@ -76,6 +79,14 @@ Dependencies for testing and documentation are listed in the
`requirements-dev.txt <requirements-dev.txt>`_ file.
+Non-Python dependencies
+^^^^^^^^^^^^^^^^^^^^^^^
+
+
+The ``fsl.data.dicom`` module requires the presence of Chris Rorden's
+`dcm2niix <https://github.com/rordenlab/dcm2niix>`_ program.
+
+
Documentation
-------------
--
GitLab