@@ -21,7 +21,7 @@ import json
21
21
import pathlib
22
22
import sys
23
23
24
- from pkg_resources import parse_version
24
+ from packaging . version import Version
25
25
26
26
27
27
DUMMY_FORMATS = [
@@ -66,10 +66,7 @@ def ls(args):
66
66
67
67
def tidy (args ):
68
68
# get list of documented versions
69
- versions = [
70
- parse_version (version )
71
- for version in get_formats (args .builddir )
72
- ]
69
+ versions = [Version (version ) for version in get_formats (args .builddir )]
73
70
74
71
# build dictionary of minor versions
75
72
# versions = [<Version('1.0.1')>, <Version('1.0.2')>]
@@ -78,17 +75,14 @@ def tidy(args):
78
75
# }
79
76
minor_versions = {}
80
77
for version in versions :
81
- release = version ._version .release
82
- if len (release ) > 2 :
83
- major_minor = release [:2 ]
84
- if major_minor not in minor_versions :
85
- minor_versions [major_minor ] = []
86
- minor_versions [major_minor ].append (version )
78
+ if len (version .release ) > 2 :
79
+ major_minor = version .release [:2 ]
80
+ minor_versions .setdefault (major_minor , []).append (version )
87
81
88
82
# pull out the versions we don't want any more
89
83
# e.g from ['1.0.1', '1.0.2', '1.0.3'] pull out ['1.0.1', '1.0.2']
90
84
tidy = []
91
- for major_minor , versions in minor_versions .items ():
85
+ for _major_minor , versions in minor_versions .items ():
92
86
if len (versions ) > 1 :
93
87
versions .sort ()
94
88
tidy .extend (versions [:- 1 ])
0 commit comments