Version comparing: sort 1.x versions last (#10326)

Fixes #10046

Author: stsewd

readthedocs/projects/version_handling.py

@@ -3,11 +3,7 @@
 
 from packaging.version import InvalidVersion, Version
 
-from readthedocs.builds.constants import (
-    LATEST_VERBOSE_NAME,
-    STABLE_VERBOSE_NAME,
-    TAG,
-)
+from readthedocs.builds.constants import LATEST_VERBOSE_NAME, STABLE_VERBOSE_NAME, TAG
 from readthedocs.vcs_support.backends import backend_cls
 
 
@@ -41,7 +37,9 @@ def parse_version_failsafe(version_string):
     except InvalidVersion:
         # Handle the special case of 1.x, 2.x or 1.0.x, 1.1.x
         if final_form and '.x' in final_form:
-            return parse_version_failsafe(final_form.replace('.x', '.0'))
+            # Replace the .x with .999999 so it's sorted last.
+            final_form = final_form.replace(".x", ".999999")
+            return parse_version_failsafe(final_form)
     except UnicodeError:
         pass
 

readthedocs/rtd_tests/tests/projects/test_version_sorting.py

@@ -37,7 +37,19 @@ def test_basic_sort(self):
         )
 
     def test_sort_wildcard(self):
-        identifiers = ['1.0.x', '2.0.x', '1.1.x', '1.9.x', '1.10.x']
+        identifiers = [
+            "1.0.x",
+            "2.0.x",
+            "1.1.x",
+            "1.9.x",
+            "1.10.x",
+            "1.0.0",
+            "1.0.1",
+            "2.1.0",
+            "2.1.99",
+            "1.11.0",
+            "1.10.8",
+        ]
         for identifier in identifiers:
             get(
                 Version,
@@ -50,7 +62,20 @@ def test_sort_wildcard(self):
 
         versions = list(Version.objects.filter(project=self.project))
         self.assertEqual(
-            ['latest', '2.0.x', '1.10.x', '1.9.x', '1.1.x', '1.0.x'],
+            [
+                "latest",
+                "2.1.99",
+                "2.1.0",
+                "2.0.x",
+                "1.11.0",
+                "1.10.x",
+                "1.10.8",
+                "1.9.x",
+                "1.1.x",
+                "1.0.x",
+                "1.0.1",
+                "1.0.0",
+            ],
             [v.slug for v in sort_version_aware(versions)],
         )