Skip to content

Commit 09087b2

Browse files
committed
Merge branch 'mypy' into typing/test
2 parents 289ef7f + 295bc51 commit 09087b2

File tree

4 files changed

+305
-45
lines changed

4 files changed

+305
-45
lines changed

.github/workflows/pythonpackage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: Python package
55

66
on:
77
push:
8-
branches: [ "master" ]
8+
branches: [ "master", "mypy" ]
99
pull_request:
10-
branches: [ "master" ]
10+
branches: [ "master", "mypy" ]
1111

1212
jobs:
1313
build:

canopen/network.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,6 @@ class NodeScanner:
372372
The network to use when doing active searching.
373373
"""
374374

375-
#: Activate or deactivate scanning
376-
active = True
377-
378375
SERVICES = (0x700, 0x580, 0x180, 0x280, 0x380, 0x480, 0x80)
379376

380377
def __init__(self, network: Optional[Network] = None):

0 commit comments

Comments
 (0)