Skip to content
This repository has been archived by the owner on Sep 2, 2024. It is now read-only.

Commit

Permalink
Update dbc2val dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
erikbosch committed Dec 12, 2023
1 parent c333f62 commit e004287
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/kuksa_dbc_feeder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ jobs:
type=semver,pattern={{major}}
# only needed for runners without buildx setup, will be slow
#- name: Set up QEMU
# uses: docker/setup-qemu-action@v2
- name: Set up QEMU
uses: docker/setup-qemu-action@v2

#- name: Set up Docker Buildx
# uses: docker/setup-buildx-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Log in to the Container registry
if: needs.check_ghcr_push.outputs.push == 'true'
Expand Down
4 changes: 2 additions & 2 deletions dbc2val/dbcfeederlib/elm2canbridge.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def __init__(self, canport: str, cfg: Dict[str, Any], whitelist: Optional[List[i

self._init_elm(elm, cfg['speed'], cfg['canack'])
# pylint: disable=abstract-class-instantiated
can_device = can.interface.Bus(channel=canport, interface='socketcan')
can_device = can.Bus(channel=canport, interface='socketcan')
ser_queue: Queue = Queue(QUEUE_MAX_ELEMENTS)

# mt = threading.Thread(target=self._serial_procesor, args=(ser_queue, can))
Expand Down Expand Up @@ -101,7 +101,7 @@ def _serial_reader(self, elm: serial.Serial, q: Queue) -> None:
continue
index += 1

def _serial_procesor(self, q: Queue, can_device: can.interface.Bus):
def _serial_procesor(self, q: Queue, can_device: can.BusABC):
print("elm2canbridge: Waiting for incoming...")

while True:
Expand Down
24 changes: 12 additions & 12 deletions dbc2val/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ argparse-addons==0.12.0
# via cantools
attrs==23.1.0
# via cmd2
bitstruct==8.18.0
bitstruct==8.19.0
# via cantools
can-j1939==2.0.12
# via -r requirements.in
Expand All @@ -22,21 +22,21 @@ crccheck==1.3.0
# via cantools
diskcache==5.6.3
# via cantools
exceptiongroup==1.1.3
exceptiongroup==1.2.0
# via pytest
grpcio==1.59.0
grpcio==1.60.0
# via grpcio-tools
grpcio-tools==1.59.0
grpcio-tools==1.60.0
# via kuksa-client
iniconfig==2.0.0
# via pytest
jsonpath-ng==1.6.0
# via kuksa-client
kuksa-client==0.4.1
kuksa-client==0.4.2
# via -r requirements.in
msgpack==1.0.7
# via python-can
numpy==1.26.1
numpy==1.26.2
# via can-j1939
packaging==23.2
# via
Expand All @@ -46,19 +46,19 @@ pluggy==1.3.0
# via pytest
ply==3.11
# via jsonpath-ng
protobuf==4.24.4
protobuf==4.25.1
# via grpcio-tools
py-expression-eval==0.3.14
# via -r requirements.in
pygments==2.16.1
pygments==2.17.2
# via kuksa-client
pyperclip==1.8.2
# via cmd2
pyserial==3.5
# via -r requirements.in
pytest==7.4.3
# via can-j1939
python-can==4.2.2
python-can==4.3.0
# via
# -r requirements.in
# can-j1939
Expand All @@ -73,15 +73,15 @@ types-protobuf==4.24.0.4
# via -r requirements.in
types-pyyaml==6.0.12.12
# via -r requirements.in
typing-extensions==4.8.0
typing-extensions==4.9.0
# via
# cantools
# python-can
wcwidth==0.2.8
wcwidth==0.2.12
# via cmd2
websockets==12.0
# via kuksa-client
wrapt==1.15.0
wrapt==1.16.0
# via python-can

# The following packages are considered to be unsafe in a requirements file:
Expand Down

0 comments on commit e004287

Please sign in to comment.