Skip to content

Commit 00d3904

Browse files
authored
Merge branch 'develop' into ixxat_dev
2 parents 6e3b8b3 + b2689ae commit 00d3904

40 files changed

+695
-363
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,16 @@ jobs:
2222
"3.9",
2323
"3.10",
2424
"3.11",
25+
"3.12",
2526
"pypy-3.8",
2627
"pypy-3.9",
2728
]
28-
include:
29-
# Only test on a single configuration while there are just pre-releases
30-
- os: ubuntu-latest
31-
experimental: true
32-
python-version: "3.12.0-alpha - 3.12.0"
29+
# uncomment when python 3.13.0 alpha is available
30+
#include:
31+
# # Only test on a single configuration while there are just pre-releases
32+
# - os: ubuntu-latest
33+
# experimental: true
34+
# python-version: "3.13.0-alpha - 3.13.0"
3335
fail-fast: false
3436
steps:
3537
- uses: actions/checkout@v3
@@ -95,6 +97,9 @@ jobs:
9597
- name: mypy 3.11
9698
run: |
9799
mypy --python-version 3.11 .
100+
- name: mypy 3.12
101+
run: |
102+
mypy --python-version 3.12 .
98103
- name: ruff
99104
run: |
100105
ruff check can
@@ -103,9 +108,7 @@ jobs:
103108
pylint --rcfile=.pylintrc \
104109
can/**.py \
105110
can/io \
106-
setup.py \
107111
doc/conf.py \
108-
scripts/**.py \
109112
examples/**.py \
110113
can/interfaces/socketcan
111114

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
Version 4.2.2
2+
=============
3+
4+
Bug Fixes
5+
---------
6+
* Fix socketcan KeyError (#1598, #1599).
7+
* Fix IXXAT not properly shutdown message (#1606).
8+
* Fix Mf4Reader and TRCReader incompatibility with extra CLI args (#1610).
9+
* Fix decoding error in Kvaser constructor for non-ASCII product name (#1613).
10+
11+
112
Version 4.2.1
213
=============
314

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ python-can
1717
:target: https://pypi.python.org/pypi/python-can/
1818
:alt: Supported Python implementations
1919

20-
.. |downloads| image:: https://pepy.tech/badge/python-can
20+
.. |downloads| image:: https://static.pepy.tech/badge/python-can
2121
:target: https://pepy.tech/project/python-can
2222
:alt: Downloads on PePy
2323

24-
.. |downloads_monthly| image:: https://pepy.tech/badge/python-can/month
24+
.. |downloads_monthly| image:: https://static.pepy.tech/badge/python-can/month
2525
:target: https://pepy.tech/project/python-can
2626
:alt: Monthly downloads on PePy
2727

can/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import logging
99
from typing import Any, Dict
1010

11-
__version__ = "4.2.1"
11+
__version__ = "4.2.2"
1212
__all__ = [
1313
"ASCReader",
1414
"ASCWriter",

0 commit comments

Comments
 (0)