From 39805d82dd15810aa464fe46f1a5bcd1afb99f5e Mon Sep 17 00:00:00 2001
From: Trevor Bekolay <tbekolay@gmail.com>
Date: Wed, 30 Nov 2016 12:23:51 -0500
Subject: [PATCH] Release version 1.1.0

---
 CHANGES.rst          | 28 ++++++++++++++++++++++++----
 nengo_ocl/version.py |  6 +++---
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 6bae4cc..17fce64 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,6 @@
-===============
+***************
 Release History
-===============
+***************
 
 .. Changelog entries should follow this format:
 
@@ -18,9 +18,29 @@ Release History
    - Bugfixes
    - Documentation
 
-1.0.1 (unreleased)
-==================
+1.1.0 (November 30, 2016)
+=========================
 
+**Features**
+
+- Added support for ``RectifiedLinear`` and ``Sigmoid`` neuron types.
+- Added support for arbitrary ``Process`` subclasses. Unlike the processes
+  that are explicitly supported like ``WhiteSignal``, these processes
+  may not fully utilize the OpenCL device.
+- Added support for applying synaptic filters to matrices,
+  which is commonly done when probing connection weights.
+
+**Improvements**
+
+- Supports all Nengo versions from 2.1.2 to 2.3.0.
+- The ``LIF`` model is now more accurate, and matches the implementation
+  in Nengo (see `Nengo#975 <https://github.com/nengo/nengo/pull/975>`_).
+- Several operators have been optimized and should now run faster.
+
+**Bugfixes**
+
+- Fixed compatibility issues with Python 3,
+  and certain versions of NumPy and Nengo.
 
 1.0.0 (June 6, 2016)
 ====================
diff --git a/nengo_ocl/version.py b/nengo_ocl/version.py
index 4ddfa7f..36ea5a9 100644
--- a/nengo_ocl/version.py
+++ b/nengo_ocl/version.py
@@ -8,8 +8,8 @@
 
 # --- version of this release
 name = "nengo_ocl"
-version_info = (1, 0, 1)  # (major, minor, patch)
-dev = 0
+version_info = (1, 1, 0)  # (major, minor, patch)
+dev = None
 version = "{v}{dev}".format(v='.'.join(str(v) for v in version_info),
                             dev=('.dev%d' % dev) if dev is not None else '')
 
@@ -23,5 +23,5 @@
 ]
 
 # --- latest Nengo version at time of release
-latest_nengo_version_info = (2, 2, 0)  # (major, minor, patch)
+latest_nengo_version_info = (2, 3, 0)  # (major, minor, patch)
 latest_nengo_version = '.'.join(str(v) for v in latest_nengo_version_info)