Skip to content

Commit 6288537

Browse files
committed
Use descending sorting for _valid versions_
It makes more sense to show `latest stable <newest>` than `<oldest>` first. #11069 (comment)
1 parent 6cdbe42 commit 6288537

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

readthedocs/projects/tests/test_version_handling.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ def test_sort_versions_python_packaging(self):
3939
expected = [
4040
# `latest` and `stable` are at the beginning
4141
"latest",
42-
"v1.0",
42+
"2.5.3",
4343
"1.1",
4444
"1.1.0",
45-
"2.5.3",
45+
"v1.0",
4646
# Invalid versions are at the end sorted alphabetically.
4747
"another-invalid",
4848
"invalid",
@@ -72,10 +72,10 @@ def test_sort_versions_python_packaging_latest_stable_not_at_beginning(self):
7272
]
7373

7474
expected = [
75-
"v1.0",
75+
"2.5.3",
7676
"1.1",
7777
"1.1.0",
78-
"2.5.3",
78+
"v1.0",
7979
# Invalid versions are at the end sorted alphabetically.
8080
"another-invalid",
8181
"invalid",
@@ -116,10 +116,10 @@ def test_sort_versions_calver(self):
116116
# `latest` and `stable` are at the beginning
117117
"latest",
118118
"stable",
119-
"2021.01.22",
120-
"2022.01.22",
121-
"2022.05.02",
122119
"2023.04.22",
120+
"2022.05.02",
121+
"2022.01.22",
122+
"2021.01.22",
123123
# invalid ones (alphabetically)
124124
"1.1",
125125
"1.1.0",
@@ -171,9 +171,9 @@ def test_sort_versions_custom_pattern(self):
171171
# `latest` and `stable` are at the beginning
172172
"latest",
173173
"stable",
174-
"v1.0",
175-
"v1.1",
176174
"v2.3",
175+
"v1.1",
176+
"v1.0",
177177
# invalid ones (alphabetically)
178178
"1.1",
179179
"2.5.3",

readthedocs/projects/version_handling.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def sort_versions_python_packaging(version_list, latest_stable_at_beginning):
204204

205205
all_versions = (
206206
initial_versions
207-
+ sorted(valid_versions, key=operator.itemgetter(1))
207+
+ sorted(valid_versions, key=operator.itemgetter(1), reverse=True)
208208
+ invalid_versions
209209
)
210210

@@ -265,7 +265,7 @@ def sort_versions_custom_pattern(version_list, raw_pattern, latest_stable_at_beg
265265

266266
all_versions = (
267267
initial_versions
268-
+ sorted(valid_versions, key=operator.itemgetter(1))
268+
+ sorted(valid_versions, key=operator.itemgetter(1), reverse=True)
269269
+ invalid_versions
270270
)
271271

0 commit comments

Comments
 (0)