Skip to content

Commit 965f4a8

Browse files
committed
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
2 parents baf3680 + 445f428 commit 965f4a8

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

util/versions.py

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
#!/usr/bin/env python
22

33
import json
4+
import logging as log
45
import os
56
import sys
6-
import logging as log
7-
log.basicConfig(level=log.INFO, format='%(levelname)s: %(message)s')
7+
8+
log.basicConfig(level=log.INFO, format="%(levelname)s: %(message)s")
89

910

1011
def key(v):
11-
if v == 'master':
12-
return float('inf')
13-
if v == 'stable':
12+
if v == "master":
13+
return float("inf")
14+
if v == "stable":
1415
return sys.maxsize
15-
if v == 'beta':
16+
if v == "beta":
1617
return sys.maxsize - 1
18+
if v == "pre-1.29.0":
19+
return -1
1720

18-
v = v.replace('v', '').replace('rust-', '')
21+
v = v.replace("rust-", "")
1922

2023
s = 0
21-
for i, val in enumerate(v.split('.')[::-1]):
24+
for i, val in enumerate(v.split(".")[::-1]):
2225
s += int(val) * 100**i
2326

2427
return s
@@ -31,7 +34,11 @@ def main():
3134

3235
outdir = sys.argv[1]
3336
versions = [
34-
dir for dir in os.listdir(outdir) if not dir.startswith(".") and os.path.isdir(os.path.join(outdir, dir))
37+
dir
38+
for dir in os.listdir(outdir)
39+
if not dir.startswith(".")
40+
and not dir.startswith("v")
41+
and os.path.isdir(os.path.join(outdir, dir))
3542
]
3643
versions.sort(key=key)
3744

0 commit comments

Comments
 (0)