summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.rst12
-rw-r--r--documentation/conf.py2
-rw-r--r--serial/__init__.py2
3 files changed, 11 insertions, 5 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index bf07879..03e0179 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -647,14 +647,20 @@ Bugfixes (win32):
- win32: handle errors of GetOverlappedResult in read(), fixes #121
+
Version 3.2.0 2016-10-14
--------------------------
+See 3.2.1, this one missed a merge request related to removing aio.
+
+
+Version 3.2.1 2016-10-14
+--------------------------
Improvements:
-- remove ``serial.aio`` in favor of separte package, ``pyserial-asyncio``
-- add client mode to exmaple tcp_serial_redirect.py
+- remove ``serial.aio`` in favor of separate package, ``pyserial-asyncio``
+- add client mode to example ``tcp_serial_redirect.py``
- use of monotonic clock for timeouts, when available (Python 3.3 and up)
-- [#169] arbitrary baudrate support for BSD family
+- [#169] arbitrary baud rate support for BSD family
- improve tests, improve ``loop://``
Bugfixes:
diff --git a/documentation/conf.py b/documentation/conf.py
index ba5b814..a03b171 100644
--- a/documentation/conf.py
+++ b/documentation/conf.py
@@ -47,7 +47,7 @@ copyright = u'2001-2016, Chris Liechti'
# The short X.Y version.
version = '3.2'
# The full version, including alpha/beta/rc tags.
-release = '3.2.0'
+release = '3.2.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/serial/__init__.py b/serial/__init__.py
index f010bea..4cd3a25 100644
--- a/serial/__init__.py
+++ b/serial/__init__.py
@@ -13,7 +13,7 @@ import importlib
from serial.serialutil import *
#~ SerialBase, SerialException, to_bytes, iterbytes
-__version__ = '3.2'
+__version__ = '3.2.1'
VERSION = __version__