From d280469fa79722ebafe83c538ae6c8a2b3579341 Mon Sep 17 00:00:00 2001
From: Trevor Bekolay <tbekolay@gmail.com>
Date: Thu, 23 Feb 2017 16:11:22 -0500
Subject: [PATCH] Release version 1.2.0

---
 CHANGES.rst          | 8 ++++++--
 README.rst           | 2 ++
 nengo_ocl/version.py | 6 +++---
 setup.cfg            | 3 +++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cf506f9..f1df82b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -18,10 +18,14 @@ Release History
    - Bugfixes
    - Documentation
 
-1.1.1 (unreleased)
-==================
+1.2.0 (February 23, 2017)
+=========================
 
+**Improvements**
 
+- Supports all Nengo versions from 2.1.2 to 2.3.1.
+- ``nengo_ocl.Simulator`` is no longer a subclass of ``nengo.Simulator``,
+  reducing the chances that Nengo OCL will be affected by changes in Nengo.
 
 1.1.0 (November 30, 2016)
 =========================
diff --git a/README.rst b/README.rst
index 447d91e..a967816 100644
--- a/README.rst
+++ b/README.rst
@@ -46,6 +46,7 @@ The requirements are the same as Nengo, with the additional Python packages
 ``mako`` and ``pyopencl`` (where the latter requires installing OpenCL).
 
 General:
+
 * Python 2.7+ or Python 3.3+ (same as Nengo)
 * One or more OpenCL implementations (test with e.g. PyOpenCl)
 
@@ -54,6 +55,7 @@ part of installing Nengo OCL. See below for more details
 on how to install OpenCL.
 
 Python packages:
+
 * NumPy
 * nengo
 * mako
diff --git a/nengo_ocl/version.py b/nengo_ocl/version.py
index 96bca61..218f88e 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, 1, 1)  # (major, minor, patch)
-dev = 0
+version_info = (1, 2, 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, 3, 0)  # (major, minor, patch)
+latest_nengo_version_info = (2, 3, 1)  # (major, minor, patch)
 latest_nengo_version = '.'.join(str(v) for v in latest_nengo_version_info)
diff --git a/setup.cfg b/setup.cfg
index d52be73..019bf44 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,9 @@
 [aliases]
 test = pytest
 
+[bdist_wheel]
+universal = 1
+
 [check-manifest]
 ignore =
     .coveragerc