Skip to content

Commit 29efa2c

Browse files
committed
Remove deprecated pkg_resources
1 parent 01116ed commit 29efa2c

File tree

3 files changed

+9
-14
lines changed

3 files changed

+9
-14
lines changed

bin/version

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import json
2121
import pathlib
2222
import sys
2323

24-
from pkg_resources import parse_version
24+
from packaging.version import Version
2525

2626

2727
DUMMY_FORMATS = [
@@ -66,10 +66,7 @@ def ls(args):
6666

6767
def tidy(args):
6868
# 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)]
7370

7471
# build dictionary of minor versions
7572
# versions = [<Version('1.0.1')>, <Version('1.0.2')>]
@@ -78,17 +75,14 @@ def tidy(args):
7875
# }
7976
minor_versions = {}
8077
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)
8781

8882
# pull out the versions we don't want any more
8983
# e.g from ['1.0.1', '1.0.2', '1.0.3'] pull out ['1.0.1', '1.0.2']
9084
tidy = []
91-
for major_minor, versions in minor_versions.items():
85+
for _major_minor, versions in minor_versions.items():
9286
if len(versions) > 1:
9387
versions.sort()
9488
tidy.extend(versions[:-1])

setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ install_requires =
4848
cylc-sphinx-extensions>=1.4.1
4949
eralchemy==1.2.*
5050
hieroglyph>=2.1.0
51+
packaging
5152
setuptools>=50
5253
sphinx>=7.1, !=7.4.4
5354
sphinx-copybutton

src/lib/cylc_release.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from cylc.flow import __version__
44

5-
from pkg_resources import parse_version
5+
from packaging.version import Version
66

77

88
def pinned_version(version):
@@ -31,7 +31,7 @@ def pinned_version(version):
3131
'8.0rc1'
3232
3333
"""
34-
ver = parse_version(version)
34+
ver = Version(version)
3535
if ver.pre and ver.minor == 0 and ver.micro == 0:
3636
# special handling of major version pre-releases
3737
ret = (ver.major, str(ver.minor) + ''.join(map(str, ver.pre)))

0 commit comments

Comments
 (0)