Skip to content

Merge final changes from release 3.2.0 back into develop#587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hardbyte merged 4 commits into from
May 16, 2019
Merged

Merge final changes from release 3.2.0 back into develop #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e80f08
Set version to "3.2.0"
hardbyte May 13, 2019
6bbafc1
Add note about supported python versions
hardbyte May 15, 2019
7268f49
fix typo in changlog
hardbyte May 16, 2019
3ad1031
Merge branch 'develop' into release-3.2.0
hardbyte May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions CHANGELOG.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
Expand Down
11 changes: 10 additions & 1 deletion README.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
2 changes: 1 addition & 1 deletion can/__init__.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@

import logging

__version__ = "3.2.0b0"
__version__ = "3.2.0"

log = logging.getLogger('can')

Expand Down