Skip to content

Commit

Permalink
Merge branch 'develop' into ixxat_dev
Browse files Browse the repository at this point in the history
  • Loading branch information
zariiii9003 authored Oct 13, 2023
2 parents 6e3b8b3 + b2689ae commit 00d3904
Show file tree
Hide file tree
Showing 40 changed files with 695 additions and 363 deletions.
17 changes: 10 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@ jobs:
"3.9",
"3.10",
"3.11",
"3.12",
"pypy-3.8",
"pypy-3.9",
]
include:
# Only test on a single configuration while there are just pre-releases
- os: ubuntu-latest
experimental: true
python-version: "3.12.0-alpha - 3.12.0"
# uncomment when python 3.13.0 alpha is available
#include:
# # Only test on a single configuration while there are just pre-releases
# - os: ubuntu-latest
# experimental: true
# python-version: "3.13.0-alpha - 3.13.0"
fail-fast: false
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -95,6 +97,9 @@ jobs:
- name: mypy 3.11
run: |
mypy --python-version 3.11 .
- name: mypy 3.12
run: |
mypy --python-version 3.12 .
- name: ruff
run: |
ruff check can
Expand All @@ -103,9 +108,7 @@ jobs:
pylint --rcfile=.pylintrc \
can/**.py \
can/io \
setup.py \
doc/conf.py \
scripts/**.py \
examples/**.py \
can/interfaces/socketcan
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
Version 4.2.2
=============

Bug Fixes
---------
* Fix socketcan KeyError (#1598, #1599).
* Fix IXXAT not properly shutdown message (#1606).
* Fix Mf4Reader and TRCReader incompatibility with extra CLI args (#1610).
* Fix decoding error in Kvaser constructor for non-ASCII product name (#1613).


Version 4.2.1
=============

Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ python-can
:target: https://pypi.python.org/pypi/python-can/
:alt: Supported Python implementations

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

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

Expand Down
2 changes: 1 addition & 1 deletion can/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import logging
from typing import Any, Dict

__version__ = "4.2.1"
__version__ = "4.2.2"
__all__ = [
"ASCReader",
"ASCWriter",
Expand Down
Loading

0 comments on commit 00d3904

Please sign in to comment.