Skip to content

Commit 374374b

Browse files
rlubosjukkar
authored andcommitted
[nrf noup] Revert "twister: Use natural sort when generating hardware map"
This reverts commit c37deeb. This is only a temporary change, until we align our CI. To be removed once natsort is avaialble in the NCS CI. Signed-off-by: Robert Lubos <[email protected]> (cherry picked from commit 9c859b6) (cherry picked from commit ec65bcf)
1 parent d1ded33 commit 374374b

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

scripts/pylib/twister/twisterlib/hardwaremap.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import scl
1414
import logging
1515
from pathlib import Path
16-
from natsort import natsorted
1716

1817
from twisterlib.environment import ZEPHYR_BASE
1918

@@ -358,7 +357,7 @@ def readlink(link):
358357

359358
def save(self, hwm_file):
360359
# use existing map
361-
self.detected = natsorted(self.detected, key=lambda x: x.serial or '')
360+
self.detected.sort(key=lambda x: x.serial or '')
362361
if os.path.exists(hwm_file):
363362
with open(hwm_file, 'r') as yaml_file:
364363
hwm = yaml.load(yaml_file, Loader=SafeLoader)

scripts/requirements-run-test.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ pyocd>=0.35.0
77

88
# used by twister for board/hardware map
99
tabulate
10-
natsort
1110

1211
# used by mcuboot
1312
cbor>=1.0.0

0 commit comments

Comments
 (0)