Skip to content

Commit

Permalink
multiple: change load order for attrs 17.4.0, bump dependency
Browse files Browse the repository at this point in the history
Attrs 17.4.0 contains a breaking change which fixes the super class load order.
These are the appropriate changes for labgrid, not backwards compatible with
older releases.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
  • Loading branch information
Emantor committed Feb 12, 2018
1 parent 5fde222 commit ecbdf6c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions labgrid/resource/udev.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def read_attr(self, attribute):

@target_factory.reg_resource
@attr.s(cmp=False)
class USBSerialPort(SerialPort, USBResource):
class USBSerialPort(USBResource, SerialPort):
def __attrs_post_init__(self):
self.match['SUBSYSTEM'] = 'tty'
super().__attrs_post_init__()
Expand Down Expand Up @@ -208,7 +208,7 @@ def filter_match(self, device):

@target_factory.reg_resource
@attr.s(cmp=False)
class USBEthernetInterface(EthernetInterface, USBResource):
class USBEthernetInterface(USBResource, EthernetInterface):
def __attrs_post_init__(self):
self.match['SUBSYSTEM'] = 'net'
self.match['@SUBSYSTEM'] = 'usb'
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
setup_requires=['pytest-runner', 'setuptools_scm'],
tests_require=['pytest-mock', ],
install_requires=[
'attrs>=16.3.0,<17.3.0',
'attrs>=17.4.0',
'jinja2',
'pexpect',
'pyserial>=3.3',
Expand Down

0 comments on commit ecbdf6c

Please sign in to comment.