Skip to content

Commit

Permalink
Merge pull request #1148 from Emantor/topic/serial_from_pypi
Browse files Browse the repository at this point in the history
Use pyserial fork from pypi
  • Loading branch information
Bastian-Krause committed Apr 26, 2023
2 parents 454388b + 1e9ca51 commit b774622
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
7 changes: 0 additions & 7 deletions labgrid/driver/serialdriver.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import logging
import warnings

import attr
from packaging import version
Expand Down Expand Up @@ -27,12 +26,6 @@ class SerialDriver(ConsoleExpectMixin, Driver, ConsoleProtocol):
bindings = {"port": "SerialPort", }
else:
bindings = {"port": {"SerialPort", "NetworkSerialPort"}, }
if version.parse(serial.__version__) != version.Version('3.4.0.1'):
message = ("The installed pyserial version does not contain important RFC2217 fixes.\n"
"You can install the labgrid fork via:\n"
"pip uninstall pyserial\n"
"pip install https://github.com/labgrid-project/pyserial/archive/v3.4.0.1.zip#egg=pyserial\n")
warnings.warn(message)

txdelay = attr.ib(default=0.0, validator=attr.validators.instance_of(float))
timeout = attr.ib(default=3.0, validator=attr.validators.instance_of(float))
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies = [
"jinja2==3.0.2",
"packaging==21.0",
"pexpect==4.8.0",
"pyserial @ git+https://github.com/labgrid-project/pyserial.git@v3.4.0.1",
"pyserial-labgrid>=3.4.0.1",
"pytest==7.2.2",
"pyudev==0.22.0",
"pyusb==1.2.1",
Expand Down

0 comments on commit b774622

Please sign in to comment.