diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c7f90b080..2f50dca8d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,14 +6,17 @@ Major features -------------- * FD support added for Pcan by @bmeisels with input from - @markupsp, @christiansandberg & @felixdivo in PR #537 + @markuspi, @christiansandberg & @felixdivo in PR #537 +* This is the last version of python-can which will support Python 2.7 + and Python 3.5. Support has been removed for Python 3.4 in this + release in PR #532 Other notable changes --------------------- -* #532 Support has been removed for Python 3.4 * #533 BusState is now an enum. * #535 This release should automatically be published to PyPi by travis. +* #577 Travis-ci now uses stages. * #548 A guide has been added for new io formats. * #550 Finish moving from nose to pytest. * #558 Fix installation on Windows. diff --git a/README.rst b/README.rst index 360d420b2..affcde831 100644 --- a/README.rst +++ b/README.rst @@ -37,7 +37,16 @@ Python developers; providing common abstractions to different hardware devices, and a suite of utilities for sending and receiving messages on a can bus. -The library supports Python 2.7, Python 3.5+ as well as PyPy 2 & 3 and runs on Mac, Linux and Windows. +The library supports Python 2.7, Python 3.5+ as well as PyPy 2 & 3 and runs +on Mac, Linux and Windows. + +================== =========== +Library Version Python +------------------ ----------- + 2.x 2.6+, 3.4+ + 3.x 2.7+, 3.5+ + 4.x (expected) 3.6+ +================== =========== Features diff --git a/can/__init__.py b/can/__init__.py index acf440645..a612363ae 100644 --- a/can/__init__.py +++ b/can/__init__.py @@ -8,7 +8,7 @@ import logging -__version__ = "3.2.0b0" +__version__ = "3.2.0" log = logging.getLogger('can')