about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-06-17 08:07:53 +0000
committerbors <bors@rust-lang.org>2023-06-17 08:07:53 +0000
commit965f4a84928f61b7ea4a33158d44cc4c6d698481 (patch)
tree4a0303e9cddf6628ee698335ec07d4c13b809102
parentbaf3680d1b06e0172a6dc8687f9e7df8ff27f51b (diff)
parent445f428a654bc92f629272277b318f2a3580e357 (diff)
downloadrust-965f4a84928f61b7ea4a33158d44cc4c6d698481.tar.gz
rust-965f4a84928f61b7ea4a33158d44cc4c6d698481.zip
Auto merge of #10973 - flip1995:fix-version-py-script, r=flip1995
Fix version.py after deleting v* dirs

I missed updating this file.

I also ran black and isort over it.

Fixes the [deployment failure](https://github.com/rust-lang/rust-clippy/actions/runs/5297071588/jobs/9588599397)

r? `@ghost`

changelog: none
-rwxr-xr-xutil/versions.py25
1 files changed, 16 insertions, 9 deletions
diff --git a/util/versions.py b/util/versions.py
index 0cfa007d1b2..c041fc606a8 100755
--- a/util/versions.py
+++ b/util/versions.py
@@ -1,24 +1,27 @@
 #!/usr/bin/env python
 
 import json
+import logging as log
 import os
 import sys
-import logging as log
-log.basicConfig(level=log.INFO, format='%(levelname)s: %(message)s')
+
+log.basicConfig(level=log.INFO, format="%(levelname)s: %(message)s")
 
 
 def key(v):
-    if v == 'master':
-        return float('inf')
-    if v == 'stable':
+    if v == "master":
+        return float("inf")
+    if v == "stable":
         return sys.maxsize
-    if v == 'beta':
+    if v == "beta":
         return sys.maxsize - 1
+    if v == "pre-1.29.0":
+        return -1
 
-    v = v.replace('v', '').replace('rust-', '')
+    v = v.replace("rust-", "")
 
     s = 0
-    for i, val in enumerate(v.split('.')[::-1]):
+    for i, val in enumerate(v.split(".")[::-1]):
         s += int(val) * 100**i
 
     return s
@@ -31,7 +34,11 @@ def main():
 
     outdir = sys.argv[1]
     versions = [
-        dir for dir in os.listdir(outdir) if not dir.startswith(".") and os.path.isdir(os.path.join(outdir, dir))
+        dir
+        for dir in os.listdir(outdir)
+        if not dir.startswith(".")
+        and not dir.startswith("v")
+        and os.path.isdir(os.path.join(outdir, dir))
     ]
     versions.sort(key=key)