From 0910ad09f95518fd705e880d09b533d831971177 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 1 Apr 2022 15:43:54 -0700 Subject: [PATCH] CARS.md: sort cars in lowercase (#24086) * sort cars in lowercase * nicer name * skoda deserves better * lock old-commit-hash: 9d44f790b3fdbdc2c7742d1e4fc603bae0364bda --- Pipfile | 4 ++-- Pipfile.lock | 4 ++-- docs/CARS.md | 28 ++++++++++++++-------------- selfdrive/car/docs.py | 3 ++- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Pipfile b/Pipfile index dd957a9dae..c12f1d9702 100644 --- a/Pipfile +++ b/Pipfile @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7d458447a6077d0e58d47e4898fca9a30b4415e829693775e72ec7b2f80ed42 -size 1384 +oid sha256:ed6317ab27aa006250dc03372865b0a48e86cdf3060ad75206df3b6c22a00559 +size 1398 diff --git a/Pipfile.lock b/Pipfile.lock index f61f2d06dc..e990d6e946 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:015971e02136b570f2b5d518fa1f7525bc5723294986bc34d6599f74383d9758 -size 136606 +oid sha256:e5214ea7672333a1ac7a11010f7f99c97f2f47a3b8347f655e3197558cd88b9a +size 138292 diff --git a/docs/CARS.md b/docs/CARS.md index 024158ae25..5b77b1275e 100644 --- a/docs/CARS.md +++ b/docs/CARS.md @@ -109,6 +109,13 @@ How We Rate The Cars |Mazda|CX-5 2022|All|||||| |SEAT|Ateca 2018|Driver Assistance|||||| |SEAT|Leon 2014-20|Driver Assistance|||||| +|Škoda|Kamiq 2021[6](#footnotes)|Driver Assistance|||||| +|Škoda|Karoq 2019|Driver Assistance|||||| +|Škoda|Kodiaq 2018-19|Driver Assistance|||||| +|Škoda|Octavia 2015, 2018-19|Driver Assistance|||||| +|Škoda|Octavia RS 2016|Driver Assistance|||||| +|Škoda|Scala 2020|Driver Assistance|||||| +|Škoda|Superb 2015-18|Driver Assistance|||||| |Toyota|Avalon 2019-21|TSS-P|[3](#footnotes)||||| |Toyota|Avalon Hybrid 2019-21|TSS-P|[3](#footnotes)||||| |Toyota|C-HR 2017-21|All|||||| @@ -121,13 +128,14 @@ How We Rate The Cars |Toyota|Sienna 2018-20|All|[3](#footnotes)||||| |Volkswagen|Arteon 2018, 2021[8](#footnotes)|Driver Assistance|||||| |Volkswagen|Atlas 2018-19, 2022[8](#footnotes)|Driver Assistance|||||| +|Volkswagen|e-Golf 2014, 2019-20|Driver Assistance|||||| |Volkswagen|Golf 2015-20|Driver Assistance|||||| |Volkswagen|Golf Alltrack 2017-18|Driver Assistance|||||| |Volkswagen|Golf GTE 2016|Driver Assistance|||||| |Volkswagen|Golf GTI 2018-21|Driver Assistance|||||| |Volkswagen|Golf R 2016-19|Driver Assistance|||||| -|Volkswagen|Golf SportWagen 2015|Driver Assistance|||||| |Volkswagen|Golf SportsVan 2016|Driver Assistance|||||| +|Volkswagen|Golf SportWagen 2015|Driver Assistance|||||| |Volkswagen|Jetta 2018-21|Driver Assistance|||||| |Volkswagen|Jetta GLI 2021|Driver Assistance|||||| |Volkswagen|Passat 2016-18[7](#footnotes)|Driver Assistance|||||| @@ -137,14 +145,6 @@ How We Rate The Cars |Volkswagen|Taos 2022[8](#footnotes)|Driver Assistance|||||| |Volkswagen|Tiguan 2020-22[8](#footnotes)|Driver Assistance|||||| |Volkswagen|Touran 2017|Driver Assistance|||||| -|Volkswagen|e-Golf 2014, 2019-20|Driver Assistance|||||| -|Škoda|Kamiq 2021[6](#footnotes)|Driver Assistance|||||| -|Škoda|Karoq 2019|Driver Assistance|||||| -|Škoda|Kodiaq 2018-19|Driver Assistance|||||| -|Škoda|Octavia 2015, 2018-19|Driver Assistance|||||| -|Škoda|Octavia RS 2016|Driver Assistance|||||| -|Škoda|Scala 2020|Driver Assistance|||||| -|Škoda|Superb 2015-18|Driver Assistance|||||| ## Bronze Cars @@ -159,16 +159,17 @@ How We Rate The Cars |Chrysler|Pacifica 2020|Adaptive Cruise|||||| |Chrysler|Pacifica Hybrid 2017-18|Adaptive Cruise|||||| |Chrysler|Pacifica Hybrid 2019-21|Adaptive Cruise|||||| -|GMC|Acadia 2018[1](#footnotes)|Adaptive Cruise|||||| |Genesis|G90 2018|All|||||| +|GMC|Acadia 2018[1](#footnotes)|Adaptive Cruise|||||| |Honda|Accord 2018-21|All|||||| |Honda|Accord Hybrid 2018-21|All|||||| -|Honda|CR-V 2015-16|Touring|||||| -|Honda|CR-V 2017-21|Honda Sensing|||||| -|Honda|CR-V Hybrid 2017-19|Honda Sensing|||||| |Honda|Civic 2016-18|Honda Sensing|||||| |Honda|Civic 2019-20|All|||[2](#footnotes)||| |Honda|Civic Hatchback 2017-21|Honda Sensing|||||| +|Honda|CR-V 2015-16|Touring|||||| +|Honda|CR-V 2017-21|Honda Sensing|||||| +|Honda|CR-V Hybrid 2017-19|Honda Sensing|||||| +|Honda|e 2020|All|||||| |Honda|Fit 2018-19|Honda Sensing|||||| |Honda|Freed 2020|Honda Sensing|||||| |Honda|HR-V 2019-20|Honda Sensing|||||| @@ -178,7 +179,6 @@ How We Rate The Cars |Honda|Passport 2019-21|All|||||| |Honda|Pilot 2016-21|Honda Sensing|||||| |Honda|Ridgeline 2017-21|Honda Sensing|||||| -|Honda|e 2020|All|||||| |Hyundai|Elantra 2017-19|SCC + LKAS|||||| |Hyundai|Genesis 2015-16|SCC + LKAS|||||| |Hyundai|Ioniq Electric 2019|SCC + LKAS|||||| diff --git a/selfdrive/car/docs.py b/selfdrive/car/docs.py index baa5732648..a39e8df805 100755 --- a/selfdrive/car/docs.py +++ b/selfdrive/car/docs.py @@ -3,6 +3,7 @@ import argparse import jinja2 import os from enum import Enum +from natsort import natsorted from typing import Dict, List from common.basedir import BASEDIR @@ -47,7 +48,7 @@ def get_tier_car_info() -> Dict[Tier, List[CarInfo]]: # Sort cars by make and model + year for tier, cars in tier_car_info.items(): - tier_car_info[tier] = sorted(cars, key=lambda x: x.make + x.model) + tier_car_info[tier] = natsorted(cars, key=lambda car: (car.make + car.model).lower()) return tier_car_info