Skip to content

Commit fd49d0a

Browse files
committed
Change LooseVersion to packaging.version.Version
1 parent 620f23a commit fd49d0a

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

pre_commit_hooks/check_autopkg_recipes.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import os
88
import sys
99
from contextlib import contextmanager
10-
from distutils.version import LooseVersion
10+
from packaging.version import Version
1111

1212
from pre_commit_hooks.util import (
1313
load_autopkg_recipe,
@@ -179,17 +179,15 @@ def validate_minimumversion(process, min_vers, ignore_min_vers_before, filename)
179179
# Warn if using a MinimumVersion greater than or equal to 2
180180
# warn_on_vers = "2"
181181
# suggest_vers = "1.4.1"
182-
# if LooseVersion(min_vers) >= LooseVersion(warn_on_vers):
182+
# if Version(min_vers) >= Version(warn_on_vers):
183183
# print(
184184
# "{}: WARNING: Choosing MinimumVersion {} limits the potential "
185185
# "audience for your AutoPkg recipe. Consider using MinimumVersion "
186186
# "{} if your processors support it.".format(filename, min_vers, suggest_vers)
187187
# )
188188

189189
# Processors for which a minimum version of AutoPkg is required.
190-
# Note: Because LooseVersion considers version 1.0 to be "less than" 1.0.0,
191-
# specifying more trailing zeros than needed in the dict below may result
192-
# in false positive errors for users of the check-autopkg-recipes hook.
190+
# Note: packaging.version.Version considers this True: "1.0" == "1.0.0"
193191
proc_min_versions = {
194192
"AppPkgCreator": "1.0",
195193
"BrewCaskInfoProvider": "0.2.5",
@@ -230,10 +228,10 @@ def validate_minimumversion(process, min_vers, ignore_min_vers_before, filename)
230228
for proc in [
231229
x
232230
for x in proc_min_versions
233-
if LooseVersion(proc_min_versions[x]) >= LooseVersion(ignore_min_vers_before)
231+
if Version(proc_min_versions[x]) >= Version(ignore_min_vers_before)
234232
]:
235233
if proc in [x.get("Processor") for x in process]:
236-
if LooseVersion(min_vers) < LooseVersion(proc_min_versions[proc]):
234+
if Version(min_vers) < Version(proc_min_versions[proc]):
237235
print(
238236
"{}: {} processor requires minimum AutoPkg "
239237
"version {}".format(filename, proc, proc_min_versions[proc])
@@ -544,7 +542,6 @@ def main(argv=None):
544542

545543
retval = 0
546544
for filename in args.filenames:
547-
548545
recipe = load_autopkg_recipe(filename)
549546
if not recipe:
550547
retval = 1

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
author="Elliot Jordan",
1212
author_email="elliot@elliotjordan.com",
1313
packages=["pre_commit_hooks"],
14-
install_requires=["ruamel.yaml>=0.15"],
14+
install_requires=["ruamel.yaml>=0.15", "packaging>=23.2"],
1515
entry_points={
1616
"console_scripts": [
1717
"check-autopkg-recipe-list = pre_commit_hooks.check_autopkg_recipe_list:main",

0 commit comments

Comments
 (0)